diff --git a/.solcover.js b/.solcover.js
index 036c8ff1ff..55a0be5102 100644
--- a/.solcover.js
+++ b/.solcover.js
@@ -55,7 +55,8 @@ module.exports = {
     'interfaces/',
     'libraries/',
     'mocks/',
-    'modules/assessment/AssessmentViews.sol',
+    'modules/assessment/AssessmentViewer.sol',
+    'modules/viewer/NexusViewer.sol',
     'modules/cover/CoverViewer.sol',
     'modules/governance/external',
     'modules/legacy',
diff --git a/deployments/README.md b/deployments/README.md
index 9804c68e51..0a88e94c7b 100644
--- a/deployments/README.md
+++ b/deployments/README.md
@@ -55,7 +55,7 @@ node_modules/@nexusmutual/deployments/dist/data/abis/Assessment.json
 Run build script:
 
 ```shell
-npm run build:deployments
+npm run deployments:build
 ```
 
 This script will generate abis and typings for contracts defined by `contractList` in the `build.js` file using Hardhat. The script will also auto update the `package.json` version.
diff --git a/deployments/build.js b/deployments/build.js
index 96108f3053..c2c766476f 100644
--- a/deployments/build.js
+++ b/deployments/build.js
@@ -6,10 +6,12 @@ const { build } = require('tsup');
 const rootPath = config.paths.root;
 const contractList = [
   'Assessment',
+  'AssessmentViewer',
   'Cover',
-  'CoverMigrator',
+  'CoverBroker',
   'CoverNFTDescriptor',
   'CoverNFT',
+  'CoverProducts',
   'CoverViewer',
   ['Aggregator', 'EACAggregatorProxy'],
   ['@openzeppelin/contracts-v4/token/ERC20/ERC20.sol:ERC20', 'ERC20'],
@@ -18,16 +20,15 @@ const contractList = [
   'LegacyClaimProofs',
   'LegacyClaimsData',
   'LegacyClaimsReward',
-  'LegacyGateway',
   'LegacyPooledStaking',
   'LegacyQuotationData',
   'MCR',
   'MemberRoles',
   'NXMaster',
   'NXMToken',
+  'NexusViewer',
   'Pool',
   'PriceFeedOracle',
-  'ProductsV1',
   'ProposalCategory',
   'Ramm',
   'SafeTracker',
@@ -39,7 +40,6 @@ const contractList = [
   'StakingViewer',
   'SwapOperator',
   'TokenController',
-  'CoverBroker',
   'wNXM',
   'YieldTokenIncidents',
 ];
diff --git a/deployments/package-lock.json b/deployments/package-lock.json
index 96fea366f7..501c598b39 100644
--- a/deployments/package-lock.json
+++ b/deployments/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@nexusmutual/deployments",
-  "version": "2.6.1",
+  "version": "2.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@nexusmutual/deployments",
-      "version": "2.6.1",
+      "version": "2.7.1",
       "license": "GPL-3.0"
     }
   }
diff --git a/deployments/package.json b/deployments/package.json
index 0bde89e91a..4c8ad433c6 100644
--- a/deployments/package.json
+++ b/deployments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nexusmutual/deployments",
-  "version": "2.6.2",
+  "version": "2.7.1",
   "description": "Nexus Mutual deployed contract addresses and abis",
   "typings": "./dist/index.d.ts",
   "main": "./dist/index.js",
diff --git a/deployments/src/addresses.json b/deployments/src/addresses.json
index ab07b2e8ce..e3187dbcb9 100644
--- a/deployments/src/addresses.json
+++ b/deployments/src/addresses.json
@@ -1,41 +1,41 @@
 {
   "Assessment": "0xcafeaa5f9c401b7295890f309168Bbb8173690A3",
+  "AssessmentViewer": "0xcafeaC01F6BA70567f5EA7dD4e114f8E5FDa5bf6",
   "Chainlink-DAI-ETH": "0x773616E4d11A78F511299002da57A0a94577F1f4",
   "Chainlink-ENZYME-VAULT": "0xCc72039A141c6e34a779eF93AEF5eB4C82A893c7",
   "Chainlink-ETH-USD": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419",
   "Chainlink-RETH-ETH": "0x536218f9E9Eb48863970252233c8F271f554C2d0",
   "Chainlink-STETH-ETH": "0x86392dC19c0b719886221c78AB11eb8Cf5c52812",
   "Cover": "0xcafeac0fF5dA0A2777d915531bfA6B29d282Ee62",
-  "CoverMigrator": "0xcafeac41b010299A9bec5308CCe6aFC2c4DF8D39",
+  "CoverBroker": "0x0000cbD7a26f72Ff222bf5f136901D224b08BE4E",
   "CoverNFT": "0xcafeaCa76be547F14D0220482667B42D8E7Bc3eb",
+  "CoverProducts": "0xcafead81a2c2508e7344155eB0DA67a3a487AA8d",
   "CoverViewer": "0xcafea84e199C85E44F34CD75374188D33FB94B4b",
   "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-  "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
   "Governance": "0x4A5C681dDC32acC6ccA51ac17e9d461e6be87900",
   "IndividualClaims": "0xcafeac12feE6b65A710fA9299A98D65B4fdE7a62",
   "LegacyClaimProofs": "0xcafea81b73daB8F42C5eca7d2E821A82660B6775",
   "LegacyClaimsData": "0xdc2D359F59F6a26162972c3Bd0cFBfd8C9Ef43af",
   "LegacyClaimsReward": "0xcafeaDcAcAA2CD81b3c54833D6896596d218BFaB",
-  "LegacyGateway": "0x089Ab1536D032F54DFbC194Ba47529a4351af1B5",
   "LegacyPooledStaking": "0x84EdfFA16bb0b9Ab1163abb0a13Ff0744c11272f",
   "LegacyQuotationData": "0x1776651F58a17a50098d31ba3C3cD259C1903f7A",
   "MCR": "0xcafea92739e411a4D95bbc2275CA61dE6993C9a7",
   "MemberRoles": "0x055CC48f7968FD8640EF140610dd4038e1b03926",
   "NXMToken": "0xd7c49CEE7E9188cCa6AD8FF264C1DA2e69D4Cf3B",
   "NXMaster": "0x01BFd82675DBCc7762C84019cA518e701C0cD07e",
+  "NexusViewer": "0xcafea70070104A17f10a1E61d6BaBE30D64B7Ec2",
   "Pool": "0xcafeaBED7e0653aFe9674A3ad862b78DB3F36e60",
   "PriceFeedOracle": "0xcafea210B662b19bbd1692873A46be324a482672",
-  "ProductsV1": "0xcafeab02966FdC69Ce5aFDD532DD51466892E32B",
   "ProposalCategory": "0x888eA6Ab349c854936b98586CE6a17E98BF254b2",
   "Ramm": "0xcafea54f03E1Cc036653444e581A10a43B2487CD",
   "SafeTracker": "0xcafeaB8B01C74c2239eA9b2B0F6aB2dD409c6c13",
   "StakingNFT": "0xcafea508a477D94c502c253A58239fb8F948e97f",
   "StakingPoolFactory": "0xcafeafb97BF8831D95C0FC659b8eB3946B101CB3",
   "StakingProducts": "0xcafea573fBd815B5f59e8049E71E554bde3477E4",
-  "StakingViewer": "0xcafea970135C07B07a3eCA76C6c00AAC849767b3",
+  "StakingViewer": "0xcafea570fA5DFfAdc471528C102114bC233b683A",
   "SwapOperator": "0xcafea3cA5366964A102388EAd5f3eBb0769C46Cb",
   "TokenController": "0x5407381b6c251cFd498ccD4A1d877739CB7960B8",
+  "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
   "wNXM": "0x0d438F3b5175Bebc262bF23753C1E53d03432bDE",
-  "YieldTokenIncidents": "0xcafeac831dC5ca0D7ef467953b7822D2f44C8f83",
-  "CoverBroker": "0x0000cbD7a26f72Ff222bf5f136901D224b08BE4E"
+  "YieldTokenIncidents": "0xcafeac831dC5ca0D7ef467953b7822D2f44C8f83"
 }
diff --git a/package-lock.json b/package-lock.json
index cf4dc69d6a..d7ecf37f52 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nexusmutual",
-  "version": "2.6.2",
+  "version": "2.7.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nexusmutual",
-      "version": "2.6.2",
+      "version": "2.7.1",
       "license": "GPL-3.0",
       "dependencies": {
         "@nexusmutual/deployments": "^2.6.2",
diff --git a/package.json b/package.json
index c6ca5cc8af..0997f6ce7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nexusmutual",
-  "version": "2.6.2",
+  "version": "2.7.1",
   "description": "NexusMutual smart contracts",
   "repository": {
     "type": "git",