diff --git a/addresses/address.json b/addresses/address.json
index b62416c9a..e104ddcfa 100644
--- a/addresses/address.json
+++ b/addresses/address.json
@@ -2,95 +2,96 @@
   "rinkeby": {
     "chainId": 4,
     "Ocean": "0x8967bcf84170c91b0d24d4302c2376283b0b3a07",
-    "OPFCommunityFeeCollector": "0x4d37BFFA8D7E9aCD1774F736316d601BAf0F882b",
-    "startBlock": 10546981,
-    "poolTemplate": "0x33445729086BBEA45305DAB2a4bb148FBc221A22",
-    "Router": "0x27f2294f40e5c295b44ad7A19137B315E7bCfD36",
-    "FixedPrice": "0x3F5f19077Ff94afBd7cbb9E3bE5Fb110059826Ed",
-    "Staking": "0xb0889Fd1146Ff6ab513Ca40e142E13e769b6d813",
+    "OPFCommunityFeeCollector": "0x708d09d57DE67fb2dd826eC29BFcB2dcD1631fF3",
+    "startBlock": 10645928,
+    "poolTemplate": "0xe9D16Ae40602d7e4F5387D10456c45B7Cf34036A",
+    "Router": "0x03e9E487B9D515CA20b62e95a2d700D61E6d6f2d",
+    "FixedPrice": "0xb7bE0F44261DE18D93aa3f56e56Cfa6C1149a14E",
+    "Staking": "0x4dC86B78E2CC354376916E20a6963ff6cbEE9063",
     "ERC20Template": {
-      "1": "0x6aebBa95eaE89a20d07666b2015B92AEDcE72C13"
+      "1": "0xc9d6CC617D92e987b32a0C1646Ac6DdbF94B6d56",
+      "2": "0xCc665e0737A130B37a4fB76b01eA24Ef34c85F46"
     },
     "ERC721Template": {
-      "1": "0xc7b299814Fe5f79DbdF79E1cCCdDD978492d25e6"
+      "1": "0xfB16c3f3a44aAa3b4358C49a426d982159ABf278"
     },
-    "Dispenser": "0x61Ce4B4918fF7bd5e43EcD1A5E10eBf27aa1f242",
-    "ERC721Factory": "0x03ABAd83b9f2F182D6C9d3FA70619Abc2edc8ccC"
+    "Dispenser": "0x124945bC8CEbbC8C3e4081F9fFcb9a13b99a70eB",
+    "ERC721Factory": "0x1acD6Dc9603a6ef87758AC7a26aa94e098503a3F"
   },
   "mumbai": {
     "chainId": 80001,
     "Ocean": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8",
-    "OPFCommunityFeeCollector": "0x084237857d092235831329b943b538529652cE96",
-    "startBlock": 26035289,
-    "poolTemplate": "0x8d2933986955a161A4Fbf9CDC5c357b9a9Da4E03",
-    "Router": "0xAF515918EF423419270A1A4f9869cF5a266c6796",
-    "FixedPrice": "0xDbcDac0D28461be201704592F05E9B67239d35e8",
-    "Staking": "0x232db364A0583f5d9eF0756d75563b406bDe3C19",
+    "OPFCommunityFeeCollector": "0xC92F5C79005D238326e6386E0EC85670f7Df28B7",
+    "startBlock": 26267613,
+    "poolTemplate": "0x4a9E829828C0cAd44ADCe9C1C247d5a6007eFB03",
+    "Router": "0x124C233056aa104C00a6408dC4D6237f3a9a3a97",
+    "FixedPrice": "0x2cb5B61448041BAef7a306b1AF65890b4CE9f956",
+    "Staking": "0x931A721D7320c7bF13419777c2dF21b7B6CeEd87",
     "ERC20Template": {
-      "1": "0x386d1ea5fAED37Ac0519E295274C8Bc8d0883617",
-      "2": "0xcB255ADB247DF3ffD312b1eb694A338C7F27A34A"
+      "1": "0xDc0506D642631Bd4c1C4deDe768e2acd7fB59218",
+      "2": "0x84f1e5eEFdf6eF815fc27540164488bfC20856D7"
     },
     "ERC721Template": {
-      "1": "0x99b008e32837f217009bEC69F8d373F90F31A56C"
+      "1": "0x997bbfc1C504eF5d99066ED9Aeff63d47EF2bA7e"
     },
-    "Dispenser": "0x8E588A3F77E13a075c295BF5feB71a871264ec49",
-    "ERC721Factory": "0xED8a4CD4773ba0453Ac43E79C50d7A2Eae6DE446"
+    "Dispenser": "0x4089a3c7Cd14667f91D4fa97a13a4032f8Df92a1",
+    "ERC721Factory": "0x8D806CD233A6B02f6A461Ed17BCB6ADC96D5C6B8"
   },
   "ropsten": {
     "chainId": 3,
     "Ocean": "0x5e8DCB2AfA23844bcc311B00Ad1A0C30025aADE9",
-    "OPFCommunityFeeCollector": "0xA313a85301F2Ced685351B210bDb20feA7FCD7F0",
-    "startBlock": 12210580,
-    "poolTemplate": "0x591be66420618e23Aa9BEeb8b8f61FD026D2F253",
-    "Router": "0x8C6B81eBC4f8336Af99563D68d1f5dc7431A438b",
-    "FixedPrice": "0x5b1D28F8FFa5C7bc9Bfb493907a6cF9567c54c1F",
-    "Staking": "0xD0c649a8487AEb4c390002A63b6b58809D672bD6",
+    "OPFCommunityFeeCollector": "0x9D951f1Bb6614b19Feff3d8DBCA0301DcA39b9e7",
+    "startBlock": 12251415,
+    "poolTemplate": "0x2f311Ba88e2609D3A100822EdAC798eb0a8F4835",
+    "Router": "0x3B942aCcb370e92A07C3227f9fdAc058F62e68C0",
+    "FixedPrice": "0xbd037e388EAd4767EeB167b088cE408E79ddeB8f",
+    "Staking": "0x235C9bE4D23dCbd16c1Bf89ec839cb7C452FD9e9",
     "ERC20Template": {
-      "1": "0xC92F5C79005D238326e6386E0EC85670f7Df28B7",
-      "2": "0x4a9E829828C0cAd44ADCe9C1C247d5a6007eFB03"
+      "1": "0xeD8CA02627867f459593DD35bC2B0C465B9E9518",
+      "2": "0x01DAcAF074C8700091dB1Cad6305503A89Abf1Aa"
     },
     "ERC721Template": {
-      "1": "0x124C233056aa104C00a6408dC4D6237f3a9a3a97"
+      "1": "0x08bEEfA4AD10C5Fcf5132326bebF1AA7181aC301"
     },
-    "Dispenser": "0x2cb5B61448041BAef7a306b1AF65890b4CE9f956",
-    "ERC721Factory": "0x931A721D7320c7bF13419777c2dF21b7B6CeEd87"
+    "Dispenser": "0x7c7d24E786887257a7EcAdBa03063E10B4Ff3655",
+    "ERC721Factory": "0x5FFE6649C7562F3bee1ca114c7c3316BF4B45b50"
   },
   "moonbase": {
     "chainId": 1287,
     "Ocean": "0xF6410bf5d773C7a41ebFf972f38e7463FA242477",
-    "OPFCommunityFeeCollector": "0x2122BaE93984dB6eBdAB19844a0743Ab219B9edf",
-    "startBlock": 2036191,
-    "poolTemplate": "0x81767619ec65F8C87A48092657316251E5172Ffb",
-    "Router": "0x7adbFE10bf7B42f73368f0131A8A1347Cb313f1b",
-    "FixedPrice": "0x144eCB1135DBe479a08D8ed4cfFA23B9648c92ff",
-    "Staking": "0x0cE55ABFA72315039c0c89AA8Df99768059160dC",
+    "OPFCommunityFeeCollector": "0xE39755Fcb9072CE3B1E3a856b828a781684766C2",
+    "startBlock": 2126600,
+    "poolTemplate": "0x084237857d092235831329b943b538529652cE96",
+    "Router": "0x8d2933986955a161A4Fbf9CDC5c357b9a9Da4E03",
+    "FixedPrice": "0xAF515918EF423419270A1A4f9869cF5a266c6796",
+    "Staking": "0xDbcDac0D28461be201704592F05E9B67239d35e8",
     "ERC20Template": {
-      "1": "0xb363f7B1b65FF6C68b88FD850118c74CEed55fE7",
-      "2": "0x1C0f1EFC6b1d94B40621580063C1E6B78ea21C26"
+      "1": "0x232db364A0583f5d9eF0756d75563b406bDe3C19",
+      "2": "0x386d1ea5fAED37Ac0519E295274C8Bc8d0883617"
     },
     "ERC721Template": {
-      "1": "0xC509C3575419b34bB52EC715584Ba76B9eC538BE"
+      "1": "0xcB255ADB247DF3ffD312b1eb694A338C7F27A34A"
     },
-    "Dispenser": "0x5A24355fCA73Fd173E6920f08b1A860d189d7Bf4",
-    "ERC721Factory": "0x92Ce44f65C5ff8b46ef139Dc22b99B0D98cCc5A5"
+    "Dispenser": "0x99b008e32837f217009bEC69F8d373F90F31A56C",
+    "ERC721Factory": "0x8E588A3F77E13a075c295BF5feB71a871264ec49"
   },
   "polygon": {
     "chainId": 137,
     "Ocean": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1",
-    "OPFCommunityFeeCollector": "0x3c21a90599b5B7f37014cA5Bf30d3f1b73d7e391",
-    "startBlock": 27705858,
-    "poolTemplate": "0xCfDdA22C9837aE76E0faA845354f33C62E03653a",
-    "Router": "0x4E6058dC00e90C0DCA47A5d0D3346F409939A5ab",
-    "FixedPrice": "0xE9397625Df9B63f0C152f975234b7988b54710B8",
-    "Staking": "0x159924ca0F47D6F704B97E29099b89e518A17B5E",
+    "OPFCommunityFeeCollector": "0xc97fa83746aDe91b0eeB16cb51326a0A980Af7c3",
+    "startBlock": 28135914,
+    "poolTemplate": "0xE5aa2C9B551aFcA4C0A98BB3B37D7A43084d0a66",
+    "Router": "0xf0c7A31D7Ee26bEBfb4BAD8e37490bEadE3F846f",
+    "FixedPrice": "0xA0329eFFa1370eAb1DC5998Db4292ae0F535a282",
+    "Staking": "0x0Ee8b03Dafc868a0899ebE1c12d734D53A957250",
     "ERC20Template": {
-      "1": "0xc313e19146Fc9a04470689C9d41a4D3054693531",
-      "2": "0x98679D582AB3398C03D3308dEB9c7AeC50B52ded"
+      "1": "0x86F2BB9F8f18B5a836b342199a3eC89F282E4018",
+      "2": "0xe47991939632757DEe324E8ec9A3268c62C0DB76"
     },
     "ERC721Template": {
-      "1": "0x1d535147a97bd87c8443125376E6671B60556E07"
+      "1": "0x4D49eEedFac8Ea03328c0E4871b680C06d892092"
     },
-    "Dispenser": "0x042D709b72B437d7d387F2679bD4ac060e561c9f",
-    "ERC721Factory": "0x4dD281EB67DED07E76E413Df16176D66ae69e240"
+    "Dispenser": "0xAEf06d8507F884674EC70330f4FBd21E23792D88",
+    "ERC721Factory": "0x298f163244e0c8cc9316D6E97162e5792ac5d410"
   }
 }
\ No newline at end of file
diff --git a/hardhat.config.js b/hardhat.config.js
index f2c27de80..99a7a828b 100644
--- a/hardhat.config.js
+++ b/hardhat.config.js
@@ -68,6 +68,12 @@ module.exports = {
       accounts:
         process.env.PRIVATE_KEY !== undefined ? [process.env.PRIVATE_KEY] : [],
     },
+    polygon: {
+      url:
+        process.env.NETWORK_RPC_URL !== undefined ? process.env.NETWORK_RPC_URL : "",
+      accounts:
+        process.env.PRIVATE_KEY !== undefined ? [process.env.PRIVATE_KEY] : [],
+    },
 
   },
   etherscan: {