diff --git a/.gitignore b/.gitignore
index 636bcbe56e..329aeebd38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ oclif.manifest.json
 contentstack-cli-logs
 packages/**/package-lock.json
 .dccache
-yarn.lock
\ No newline at end of file
+yarn.lock
+contents-*
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index f2bf30e239..3d69b66d7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2599,9 +2599,9 @@
       "dev": true
     },
     "node_modules/@types/fs-extra": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.1.tgz",
-      "integrity": "sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.2.tgz",
+      "integrity": "sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ==",
       "dev": true,
       "dependencies": {
         "@types/jsonfile": "*",
@@ -2903,6 +2903,12 @@
       "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz",
       "integrity": "sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="
     },
+    "node_modules/@types/uuid": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.4.tgz",
+      "integrity": "sha512-zAuJWQflfx6dYJM62vna+Sn5aeSWhh3OB+wfUEACNcqUSc0AGc5JKl+ycL1vrH7frGTXhJchYjE1Hak8L819dA==",
+      "dev": true
+    },
     "node_modules/@types/vinyl": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz",
@@ -8116,6 +8122,19 @@
         }
       ]
     },
+    "node_modules/fs-extra": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
     "node_modules/fs-minipass": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -21174,9 +21193,13 @@
       }
     },
     "node_modules/uuid": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -22741,25 +22764,25 @@
     },
     "packages/contentstack": {
       "name": "@contentstack/cli",
-      "version": "1.9.2",
+      "version": "1.10.0",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-audit": "~1.0.0",
-        "@contentstack/cli-auth": "~1.3.14",
-        "@contentstack/cli-cm-bootstrap": "~1.5.1",
-        "@contentstack/cli-cm-branches": "~1.0.14",
-        "@contentstack/cli-cm-bulk-publish": "~1.3.12",
-        "@contentstack/cli-cm-clone": "~1.5.1",
-        "@contentstack/cli-cm-export": "~1.9.1",
-        "@contentstack/cli-cm-export-to-csv": "~1.4.3",
-        "@contentstack/cli-cm-import": "~1.9.2",
-        "@contentstack/cli-cm-migrate-rte": "~1.4.12",
-        "@contentstack/cli-cm-seed": "~1.5.1",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-config": "~1.4.12",
-        "@contentstack/cli-launch": "~1.0.12",
-        "@contentstack/cli-migration": "~1.3.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-audit": "~1.2.0",
+        "@contentstack/cli-auth": "~1.3.15",
+        "@contentstack/cli-cm-bootstrap": "~1.6.0",
+        "@contentstack/cli-cm-branches": "~1.0.15",
+        "@contentstack/cli-cm-bulk-publish": "~1.3.13",
+        "@contentstack/cli-cm-clone": "~1.6.0",
+        "@contentstack/cli-cm-export": "~1.9.2",
+        "@contentstack/cli-cm-export-to-csv": "~1.4.4",
+        "@contentstack/cli-cm-import": "~1.10.0",
+        "@contentstack/cli-cm-migrate-rte": "~1.4.13",
+        "@contentstack/cli-cm-seed": "~1.6.0",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-config": "~1.4.13",
+        "@contentstack/cli-launch": "~1.0.13",
+        "@contentstack/cli-migration": "~1.3.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@contentstack/management": "~1.10.0",
         "@oclif/core": "^2.9.3",
         "@oclif/plugin-help": "^5",
@@ -22809,17 +22832,19 @@
     },
     "packages/contentstack-audit": {
       "name": "@contentstack/cli-audit",
-      "version": "1.0.0",
+      "version": "1.2.0",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-command": "~1.2.11",
-        "@contentstack/cli-utilities": "~1.5.1",
-        "@oclif/plugin-help": "^5.2.20",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
+        "@oclif/plugin-help": "^5",
         "@oclif/plugin-plugins": "^3.8.4",
         "chalk": "^4.1.2",
         "fast-csv": "^4.3.6",
+        "fs-extra": "^11.1.1",
         "lodash": "^4.17.21",
-        "winston": "^3.9.0"
+        "uuid": "^9.0.1",
+        "winston": "^3.10.0"
       },
       "bin": {
         "audit": "bin/run"
@@ -22827,7 +22852,9 @@
       "devDependencies": {
         "@oclif/test": "^2.0.3",
         "@types/chai": "^4.3.5",
+        "@types/fs-extra": "^11.0.2",
         "@types/node": "^20.3.1",
+        "@types/uuid": "^9.0.4",
         "chai": "^4.3.7",
         "eslint": "^8.43.0",
         "eslint-config-oclif": "^4.0.0",
@@ -23454,11 +23481,11 @@
     },
     "packages/contentstack-auth": {
       "name": "@contentstack/cli-auth",
-      "version": "1.3.14",
+      "version": "1.3.15",
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-utilities": "~1.5.4",
         "chalk": "^4.0.0",
         "debug": "^4.1.1",
         "inquirer": "8.2.4",
@@ -23495,12 +23522,12 @@
     },
     "packages/contentstack-bootstrap": {
       "name": "@contentstack/cli-cm-bootstrap",
-      "version": "1.5.1",
+      "version": "1.6.0",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-cm-seed": "~1.5.0",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-cm-seed": "~1.6.0",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "inquirer": "8.2.4",
         "mkdirp": "^1.0.4",
         "tar": "^6.1.13"
@@ -23574,7 +23601,7 @@
     },
     "packages/contentstack-branches": {
       "name": "@contentstack/cli-cm-branches",
-      "version": "1.0.14",
+      "version": "1.0.15",
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.13",
@@ -23635,11 +23662,11 @@
     },
     "packages/contentstack-bulk-publish": {
       "name": "@contentstack/cli-cm-bulk-publish",
-      "version": "1.3.12",
+      "version": "1.3.13",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "bluebird": "^3.7.2",
         "chalk": "^4.1.2",
         "dotenv": "^16.1.4",
@@ -23684,14 +23711,14 @@
     },
     "packages/contentstack-clone": {
       "name": "@contentstack/cli-cm-clone",
-      "version": "1.5.1",
+      "version": "1.6.0",
       "license": "MIT",
       "dependencies": {
         "@colors/colors": "^1.5.0",
         "@contentstack/cli-cm-export": "~1.9.0",
-        "@contentstack/cli-cm-import": "~1.9.0",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-cm-import": "~1.10.0",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "async": "^3.2.4",
         "chalk": "^4.1.0",
         "child_process": "^1.0.2",
@@ -23746,10 +23773,10 @@
     },
     "packages/contentstack-command": {
       "name": "@contentstack/cli-command",
-      "version": "1.2.13",
+      "version": "1.2.14",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-utilities": "~1.5.4",
         "contentstack": "^3.10.1"
       },
       "devDependencies": {
@@ -23820,11 +23847,11 @@
     },
     "packages/contentstack-config": {
       "name": "@contentstack/cli-config",
-      "version": "1.4.12",
+      "version": "1.4.13",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "chalk": "^4.0.0",
         "debug": "^4.1.1",
         "inquirer": "8.2.4",
@@ -24108,11 +24135,11 @@
     },
     "packages/contentstack-export": {
       "name": "@contentstack/cli-cm-export",
-      "version": "1.9.1",
+      "version": "1.9.2",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/core": "^2.9.3",
         "async": "^3.2.4",
         "big-json": "^3.2.0",
@@ -24158,11 +24185,11 @@
     },
     "packages/contentstack-export-to-csv": {
       "name": "@contentstack/cli-cm-export-to-csv",
-      "version": "1.4.3",
+      "version": "1.4.4",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "chalk": "^4.1.0",
         "fast-csv": "^4.3.6",
         "inquirer": "8.2.4",
@@ -24423,11 +24450,11 @@
     },
     "packages/contentstack-import": {
       "name": "@contentstack/cli-cm-import",
-      "version": "1.9.2",
+      "version": "1.10.0",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@contentstack/management": "~1.10.2",
         "@oclif/core": "^2.9.3",
         "big-json": "^3.2.0",
@@ -24523,19 +24550,6 @@
         "@types/node": "*"
       }
     },
-    "packages/contentstack-import/node_modules/fs-extra": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
     "packages/contentstack-import/node_modules/sinon": {
       "version": "11.1.2",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.2.tgz",
@@ -24568,12 +24582,12 @@
     },
     "packages/contentstack-launch": {
       "name": "@contentstack/cli-launch",
-      "version": "1.0.12",
+      "version": "1.0.13",
       "license": "MIT",
       "dependencies": {
         "@apollo/client": "^3.7.9",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/core": "^2.9.3",
         "@oclif/plugin-help": "^5",
         "@oclif/plugin-plugins": "^3.3.0",
@@ -24607,7 +24621,7 @@
         "eslint": "^7.32.0",
         "eslint-config-oclif": "^4",
         "eslint-config-oclif-typescript": "^1.0.3",
-        "oclif": "^3",
+        "oclif": "^3.11.3",
         "shx": "^0.3.3",
         "ts-node": "^10.9.1",
         "tslib": "^2.5.0",
@@ -25059,11 +25073,11 @@
     },
     "packages/contentstack-migrate-rte": {
       "name": "@contentstack/cli-cm-migrate-rte",
-      "version": "1.4.12",
+      "version": "1.4.13",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@contentstack/json-rte-serializer": "~2.0.2",
         "chalk": "^4.1.2",
         "collapse-whitespace": "^1.1.7",
@@ -25083,7 +25097,7 @@
         "globby": "^10.0.2",
         "mocha": "^10.0.0",
         "nyc": "^15.1.0",
-        "oclif": "^3.8.1",
+        "oclif": "^3.11.3",
         "tslib": "^1.13.0"
       },
       "engines": {
@@ -25098,11 +25112,11 @@
     },
     "packages/contentstack-migration": {
       "name": "@contentstack/cli-migration",
-      "version": "1.3.13",
+      "version": "1.3.14",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "async": "^3.2.4",
         "callsites": "^3.1.0",
         "cardinal": "^2.1.1",
@@ -25123,7 +25137,7 @@
         "mkdirp": "^1.0.4",
         "nock": "^13.1.1",
         "nyc": "^15.1.0",
-        "oclif": "^3.8.1"
+        "oclif": "^3.11.3"
       },
       "engines": {
         "node": ">=8.3.0"
@@ -25131,12 +25145,12 @@
     },
     "packages/contentstack-seed": {
       "name": "@contentstack/cli-cm-seed",
-      "version": "1.5.1",
+      "version": "1.6.0",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-cm-import": "~1.9.0",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-cm-import": "~1.10.0",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "axios": "1.3.4",
         "inquirer": "8.2.4",
         "mkdirp": "^1.0.4",
@@ -25224,7 +25238,7 @@
     },
     "packages/contentstack-utilities": {
       "name": "@contentstack/cli-utilities",
-      "version": "1.5.3",
+      "version": "1.5.4",
       "license": "MIT",
       "dependencies": {
         "@contentstack/management": "~1.10.2",
@@ -26824,22 +26838,22 @@
     "@contentstack/cli": {
       "version": "file:packages/contentstack",
       "requires": {
-        "@contentstack/cli-audit": "~1.0.0",
-        "@contentstack/cli-auth": "~1.3.14",
-        "@contentstack/cli-cm-bootstrap": "~1.5.1",
-        "@contentstack/cli-cm-branches": "~1.0.14",
-        "@contentstack/cli-cm-bulk-publish": "~1.3.12",
-        "@contentstack/cli-cm-clone": "~1.5.1",
-        "@contentstack/cli-cm-export": "~1.9.1",
-        "@contentstack/cli-cm-export-to-csv": "~1.4.3",
-        "@contentstack/cli-cm-import": "~1.9.2",
-        "@contentstack/cli-cm-migrate-rte": "~1.4.12",
-        "@contentstack/cli-cm-seed": "~1.5.1",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-config": "~1.4.12",
-        "@contentstack/cli-launch": "~1.0.12",
-        "@contentstack/cli-migration": "~1.3.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-audit": "~1.2.0",
+        "@contentstack/cli-auth": "~1.3.15",
+        "@contentstack/cli-cm-bootstrap": "~1.6.0",
+        "@contentstack/cli-cm-branches": "~1.0.15",
+        "@contentstack/cli-cm-bulk-publish": "~1.3.13",
+        "@contentstack/cli-cm-clone": "~1.6.0",
+        "@contentstack/cli-cm-export": "~1.9.2",
+        "@contentstack/cli-cm-export-to-csv": "~1.4.4",
+        "@contentstack/cli-cm-import": "~1.10.0",
+        "@contentstack/cli-cm-migrate-rte": "~1.4.13",
+        "@contentstack/cli-cm-seed": "~1.6.0",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-config": "~1.4.13",
+        "@contentstack/cli-launch": "~1.0.13",
+        "@contentstack/cli-migration": "~1.3.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@contentstack/management": "~1.10.0",
         "@oclif/core": "^2.9.3",
         "@oclif/plugin-help": "^5",
@@ -26882,19 +26896,22 @@
     "@contentstack/cli-audit": {
       "version": "file:packages/contentstack-audit",
       "requires": {
-        "@contentstack/cli-command": "~1.2.11",
-        "@contentstack/cli-utilities": "~1.5.1",
-        "@oclif/plugin-help": "^5.2.20",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
+        "@oclif/plugin-help": "^5",
         "@oclif/plugin-plugins": "^3.8.4",
         "@oclif/test": "^2.0.3",
         "@types/chai": "^4.3.5",
+        "@types/fs-extra": "^11.0.2",
         "@types/node": "^20.3.1",
+        "@types/uuid": "^9.0.4",
         "chai": "^4.3.7",
         "chalk": "^4.1.2",
         "eslint": "^8.43.0",
         "eslint-config-oclif": "^4.0.0",
         "eslint-config-oclif-typescript": "^1.0.3",
         "fast-csv": "^4.3.6",
+        "fs-extra": "^11.1.1",
         "lodash": "^4.17.21",
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
@@ -26903,7 +26920,8 @@
         "ts-node": "^10.9.1",
         "tslib": "^2.5.3",
         "typescript": "^5.1.3",
-        "winston": "^3.9.0"
+        "uuid": "^9.0.1",
+        "winston": "^3.10.0"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -27350,7 +27368,7 @@
       "version": "file:packages/contentstack-auth",
       "requires": {
         "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@fancy-test/nock": "^0.1.1",
         "@oclif/plugin-help": "^5.1.19",
         "@oclif/test": "^2.2.10",
@@ -27383,9 +27401,9 @@
     "@contentstack/cli-cm-bootstrap": {
       "version": "file:packages/contentstack-bootstrap",
       "requires": {
-        "@contentstack/cli-cm-seed": "~1.5.0",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-cm-seed": "~1.6.0",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/test": "^2.2.10",
         "@types/inquirer": "^9.0.3",
         "@types/mkdirp": "^1.0.1",
@@ -27495,8 +27513,8 @@
     "@contentstack/cli-cm-bulk-publish": {
       "version": "file:packages/contentstack-bulk-publish",
       "requires": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/test": "^1.2.6",
         "bluebird": "^3.7.2",
         "chai": "^4.2.0",
@@ -27538,9 +27556,9 @@
       "requires": {
         "@colors/colors": "^1.5.0",
         "@contentstack/cli-cm-export": "~1.9.0",
-        "@contentstack/cli-cm-import": "~1.9.0",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-cm-import": "~1.10.0",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/test": "^1.2.7",
         "async": "^3.2.4",
         "chai": "^4.2.0",
@@ -27585,10 +27603,10 @@
       "version": "file:packages/contentstack-export",
       "requires": {
         "@contentstack/cli-auth": "~1.3.14",
-        "@contentstack/cli-command": "~1.2.13",
+        "@contentstack/cli-command": "~1.2.14",
         "@contentstack/cli-config": "~1.4.11",
         "@contentstack/cli-dev-dependencies": "~1.2.3",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/core": "^2.9.3",
         "@oclif/plugin-help": "^5.1.19",
         "@oclif/test": "^1.2.6",
@@ -27638,8 +27656,8 @@
     "@contentstack/cli-cm-export-to-csv": {
       "version": "file:packages/contentstack-export-to-csv",
       "requires": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/test": "^2.2.10",
         "chai": "^4.2.0",
         "chalk": "^4.1.0",
@@ -27832,8 +27850,8 @@
     "@contentstack/cli-cm-import": {
       "version": "file:packages/contentstack-import",
       "requires": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@contentstack/management": "~1.10.2",
         "@oclif/core": "^2.9.3",
         "@oclif/test": "^1.2.6",
@@ -27921,16 +27939,6 @@
             "@types/node": "*"
           }
         },
-        "fs-extra": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-          "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
         "sinon": {
           "version": "11.1.2",
           "resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.2.tgz",
@@ -27959,8 +27967,8 @@
     "@contentstack/cli-cm-migrate-rte": {
       "version": "file:packages/contentstack-migrate-rte",
       "requires": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@contentstack/json-rte-serializer": "~2.0.2",
         "@oclif/test": "^2.2.10",
         "chai": "^4.3.4",
@@ -27975,7 +27983,7 @@
         "mocha": "^10.0.0",
         "nock": "^13.1.0",
         "nyc": "^15.1.0",
-        "oclif": "^3.8.1",
+        "oclif": "^3.11.3",
         "omit-deep-lodash": "^1.1.5",
         "sinon": "^15.0.1",
         "tslib": "^1.13.0",
@@ -27993,9 +28001,9 @@
     "@contentstack/cli-cm-seed": {
       "version": "file:packages/contentstack-seed",
       "requires": {
-        "@contentstack/cli-cm-import": "~1.9.0",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-cm-import": "~1.10.0",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/plugin-help": "^5.1.19",
         "@types/inquirer": "^9.0.3",
         "@types/jest": "^26.0.15",
@@ -28065,7 +28073,7 @@
     "@contentstack/cli-command": {
       "version": "file:packages/contentstack-command",
       "requires": {
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/test": "^2.2.10",
         "@types/chai": "^4.2.18",
         "@types/mkdirp": "^1.0.1",
@@ -28119,8 +28127,8 @@
     "@contentstack/cli-config": {
       "version": "file:packages/contentstack-config",
       "requires": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/test": "^2.2.10",
         "@types/chai": "^4.2.18",
         "@types/inquirer": "^9.0.3",
@@ -28351,8 +28359,8 @@
       "version": "file:packages/contentstack-launch",
       "requires": {
         "@apollo/client": "^3.7.9",
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/core": "^2.9.3",
         "@oclif/plugin-help": "^5",
         "@oclif/plugin-plugins": "^3.3.0",
@@ -28379,7 +28387,7 @@
         "graphql": "^16.8.1",
         "ini": "^3.0.1",
         "lodash": "^4.17.21",
-        "oclif": "^3",
+        "oclif": "^3.11.3",
         "open": "^8.4.2",
         "shx": "^0.3.3",
         "ts-node": "^10.9.1",
@@ -28695,8 +28703,8 @@
     "@contentstack/cli-migration": {
       "version": "file:packages/contentstack-migration",
       "requires": {
-        "@contentstack/cli-command": "~1.2.13",
-        "@contentstack/cli-utilities": "~1.5.3",
+        "@contentstack/cli-command": "~1.2.14",
+        "@contentstack/cli-utilities": "~1.5.4",
         "@oclif/test": "^2.2.10",
         "async": "^3.2.4",
         "callsites": "^3.1.0",
@@ -28714,7 +28722,7 @@
         "mkdirp": "^1.0.4",
         "nock": "^13.1.1",
         "nyc": "^15.1.0",
-        "oclif": "^3.8.1",
+        "oclif": "^3.11.3",
         "winston": "^3.7.2"
       }
     },
@@ -31074,9 +31082,9 @@
       "dev": true
     },
     "@types/fs-extra": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.1.tgz",
-      "integrity": "sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.2.tgz",
+      "integrity": "sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ==",
       "dev": true,
       "requires": {
         "@types/jsonfile": "*",
@@ -31379,6 +31387,12 @@
       "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz",
       "integrity": "sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="
     },
+    "@types/uuid": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.4.tgz",
+      "integrity": "sha512-zAuJWQflfx6dYJM62vna+Sn5aeSWhh3OB+wfUEACNcqUSc0AGc5JKl+ycL1vrH7frGTXhJchYjE1Hak8L819dA==",
+      "dev": true
+    },
     "@types/vinyl": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz",
@@ -35254,6 +35268,16 @@
       "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
       "dev": true
     },
+    "fs-extra": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      }
+    },
     "fs-minipass": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -44903,9 +44927,9 @@
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uuid": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",
diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md
index 6f4b4c946b..0b662fc7e2 100644
--- a/packages/contentstack-audit/README.md
+++ b/packages/contentstack-audit/README.md
@@ -2,6 +2,7 @@
 <!-- Insert Audit version here -->
 
 # @contentstack/cli-audit
+
 Audit plugin
 
 ## How to install this plugin
@@ -12,15 +13,13 @@ $ csdx plugins:install @contentstack/cli-audit
 
 ## How to use this plugin
 
-This plugin requires you to be authenticated using [csdx auth:login](https://www.contentstack.com/docs/developers/cli/authenticate-with-the-cli/).
-
 <!-- usage -->
 ```sh-session
 $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/0.0.0-alpha darwin-arm64 node-v16.19.0
+@contentstack/cli-audit/1.2.0 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -29,10 +28,12 @@ USAGE
 <!-- usagestop -->
 
 # Commands
+
 <!-- commands -->
-* [`csdx cm::stacks:audit:fix`](#csdx-cmstacksauditfix)
+* [`csdx audit`](#csdx-audit)
+* [`csdx audit:fix`](#csdx-auditfix)
 * [`csdx cm:stacks:audit`](#csdx-cmstacksaudit)
-* [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix-1)
+* [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix)
 * [`csdx help [COMMANDS]`](#csdx-help-commands)
 * [`csdx plugins`](#csdx-plugins)
 * [`csdx plugins:install PLUGIN...`](#csdx-pluginsinstall-plugin)
@@ -44,33 +45,93 @@ USAGE
 * [`csdx plugins:uninstall PLUGIN...`](#csdx-pluginsuninstall-plugin-2)
 * [`csdx plugins:update`](#csdx-pluginsupdate)
 
-## `csdx cm::stacks:audit:fix`
+## `csdx audit`
 
-Audit fix command
+Perform audits and find possible errors in the exported Contentstack data
 
 ```
 USAGE
-  $ csdx cm::stacks:audit:fix [-c <value>] [-d <value>]
+  $ csdx audit [-c <value>] [-d <value>] [--report-path <value>] [--modules
+    content-types|global-fields|entries] [--columns <value> | ] [--sort <value>] [--filter <value>] [--csv |
+    --no-truncate]
 
 FLAGS
-  -c, --config=<value>    Path of the external config.
-  -d, --data-dir=<value>  Path where the data is stored.
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+  --columns=<value>       only show provided columns (comma-separated)
+  --csv                   output is csv format [alias: --output=csv]
+  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --modules=<option>...   Provide the list of modules to be audited
+                          <options: content-types|global-fields|entries>
+  --no-truncate           do not truncate output to fit screen
+  --report-path=<value>   Path to store the audit reports
+  --sort=<value>          property to sort by (prepend '-' for descending)
 
 DESCRIPTION
-  Audit fix command
+  Perform audits and find possible errors in the exported Contentstack data
 
 ALIASES
-  $ csdx cm::stacks:audit:fix
+  $ csdx audit
+  $ csdx cm:stacks:audit
 
 EXAMPLES
-  $ csdx cm::stacks:audit:fix
+  $ csdx audit
+
+  $ csdx audit --report-path=<path>
+
+  $ csdx audit --report-path=<path> --csv
+
+  $ csdx audit --report-path=<path> --filter="name=<filter-value>"
+
+  $ csdx audit --report-path=<path> --modules=content-types --filter="name="<filter-value>"
 ```
 
-_See code: [src/commands/cm/stacks/audit/fix.ts](https://github.com/contentstack/audit/blob/main/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts)_
+## `csdx audit:fix`
+
+Perform audits and fix possible errors in the exported Contentstack data.
+
+```
+USAGE
+  $ csdx audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
+    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--columns <value> | ] [--sort <value>]
+    [--filter <value>] [--csv | --no-truncate]
+
+FLAGS
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+  --columns=<value>       only show provided columns (comma-separated)
+  --copy-dir              Create backup from the original data.
+  --copy-path=<value>     Provide the path to backup the copied data
+  --csv                   output is csv format [alias: --output=csv]
+  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --modules=<option>...   Provide the list of modules to be audited
+                          <options: content-types|global-fields|entries>
+  --no-truncate           do not truncate output to fit screen
+  --report-path=<value>   Path to store the audit reports
+  --sort=<value>          property to sort by (prepend '-' for descending)
+
+DESCRIPTION
+  Perform audits and fix possible errors in the exported Contentstack data.
+
+ALIASES
+  $ csdx audit:fix
+  $ csdx cm:stacks:audit:fix
+
+EXAMPLES
+  $ csdx audit:fix --copy-dir
+
+  $ csdx audit:fix --report-path=<path> --copy-dir
+
+  $ csdx audit:fix --report-path=<path> --copy-dir --csv
+
+  $ csdx audit:fix --report-path=<path> --filter="name=<filter-value>"
+
+  $ csdx audit:fix --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>
+```
 
 ## `csdx cm:stacks:audit`
 
-Audit and find possible errors in the exported data
+Perform audits and find possible errors in the exported Contentstack data
 
 ```
 USAGE
@@ -79,21 +140,22 @@ USAGE
     --no-truncate]
 
 FLAGS
-  -c, --config=<value>    Path of the external config.
-  -d, --data-dir=<value>  Path where the data is stored.
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
   --columns=<value>       only show provided columns (comma-separated)
   --csv                   output is csv format [alias: --output=csv]
   --filter=<value>        filter property by partial string matching, ex: name=foo
-  --modules=<option>...   Provide the list of modules to be audited.
+  --modules=<option>...   Provide the list of modules to be audited
                           <options: content-types|global-fields|entries>
   --no-truncate           do not truncate output to fit screen
-  --report-path=<value>   Path to store the audit reports.
+  --report-path=<value>   Path to store the audit reports
   --sort=<value>          property to sort by (prepend '-' for descending)
 
 DESCRIPTION
-  Audit and find possible errors in the exported data
+  Perform audits and find possible errors in the exported Contentstack data
 
 ALIASES
+  $ csdx audit
   $ csdx cm:stacks:audit
 
 EXAMPLES
@@ -112,24 +174,45 @@ _See code: [src/commands/cm/stacks/audit/index.ts](https://github.com/contentsta
 
 ## `csdx cm:stacks:audit:fix`
 
-Audit fix command
+Perform audits and fix possible errors in the exported Contentstack data.
 
 ```
 USAGE
-  $ csdx cm:stacks:audit:fix [-c <value>] [-d <value>]
+  $ csdx cm:stacks:audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
+    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--columns <value> | ] [--sort <value>]
+    [--filter <value>] [--csv | --no-truncate]
 
 FLAGS
-  -c, --config=<value>    Path of the external config.
-  -d, --data-dir=<value>  Path where the data is stored.
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+  --columns=<value>       only show provided columns (comma-separated)
+  --copy-dir              Create backup from the original data.
+  --copy-path=<value>     Provide the path to backup the copied data
+  --csv                   output is csv format [alias: --output=csv]
+  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --modules=<option>...   Provide the list of modules to be audited
+                          <options: content-types|global-fields|entries>
+  --no-truncate           do not truncate output to fit screen
+  --report-path=<value>   Path to store the audit reports
+  --sort=<value>          property to sort by (prepend '-' for descending)
 
 DESCRIPTION
-  Audit fix command
+  Perform audits and fix possible errors in the exported Contentstack data.
 
 ALIASES
-  $ csdx cm::stacks:audit:fix
+  $ csdx audit:fix
+  $ csdx cm:stacks:audit:fix
 
 EXAMPLES
-  $ csdx cm:stacks:audit:fix
+  $ csdx cm:stacks:audit:fix --copy-dir
+
+  $ csdx cm:stacks:audit:fix --report-path=<path> --copy-dir
+
+  $ csdx cm:stacks:audit:fix --report-path=<path> --copy-dir --csv
+
+  $ csdx cm:stacks:audit:fix --report-path=<path> --filter="name=<filter-value>"
+
+  $ csdx cm:stacks:audit:fix --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>
 ```
 
 _See code: [src/commands/cm/stacks/audit/fix.ts](https://github.com/contentstack/audit/blob/main/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts)_
@@ -152,7 +235,7 @@ DESCRIPTION
   Display help for csdx.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.19/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.20/src/commands/help.ts)_
 
 ## `csdx plugins`
 
@@ -175,7 +258,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.3.2/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.8.4/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:install PLUGIN...`
 
@@ -240,7 +323,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.3.2/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.8.4/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN...`
 
@@ -280,7 +363,7 @@ EXAMPLES
   $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.3.2/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.8.4/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PLUGIN`
 
@@ -309,7 +392,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.3.2/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.8.4/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:uninstall PLUGIN...`
 
@@ -357,7 +440,7 @@ ALIASES
   $ csdx plugins:remove
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.3.2/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.8.4/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:uninstall PLUGIN...`
 
@@ -398,5 +481,5 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.3.2/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.8.4/src/commands/plugins/update.ts)_
 <!-- commandsstop -->
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
index 05774ddfe6..209588ea9d 100644
--- a/packages/contentstack-audit/package.json
+++ b/packages/contentstack-audit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -18,19 +18,23 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.11",
-    "@contentstack/cli-utilities": "~1.5.1",
-    "@oclif/plugin-help": "^5.2.20",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
+    "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^3.8.4",
     "chalk": "^4.1.2",
     "fast-csv": "^4.3.6",
+    "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",
-    "winston": "^3.9.0"
+    "uuid": "^9.0.1",
+    "winston": "^3.10.0"
   },
   "devDependencies": {
     "@oclif/test": "^2.0.3",
     "@types/chai": "^4.3.5",
+    "@types/fs-extra": "^11.0.2",
     "@types/node": "^20.3.1",
+    "@types/uuid": "^9.0.4",
     "chai": "^4.3.7",
     "eslint": "^8.43.0",
     "eslint-config-oclif": "^4.0.0",
@@ -57,11 +61,6 @@
     "additionalVersionFlags": [
       "-v"
     ],
-    "topics": {
-      "cm:stacks:audit": {
-        "description": "Audit and find possible refrence errors in the exported data"
-      }
-    },
     "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-audit/<%- commandPath %>"
   },
   "scripts": {
diff --git a/packages/contentstack-audit/src/audit-base-command.ts b/packages/contentstack-audit/src/audit-base-command.ts
new file mode 100644
index 0000000000..7cc3fb1f60
--- /dev/null
+++ b/packages/contentstack-audit/src/audit-base-command.ts
@@ -0,0 +1,319 @@
+import chalk from 'chalk';
+import * as csv from 'fast-csv';
+import { copy } from 'fs-extra';
+import { v4 as uuid } from 'uuid';
+import isEmpty from 'lodash/isEmpty';
+import { join, resolve } from 'path';
+import cloneDeep from 'lodash/cloneDeep';
+import { cliux, ux } from '@contentstack/cli-utilities';
+import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+
+import config from './config';
+import { print } from './util/log';
+import { auditMsg } from './messages';
+import { BaseCommand } from './base-command';
+import { Entries, GlobalField, ContentType } from './modules';
+import { ContentTypeStruct, OutputColumn, RefErrorReturnType } from './types';
+
+export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseCommand> {
+  private currentCommand!: string;
+
+  get fixStatus() {
+    return {
+      fixStatus: {
+        minWidth: 7,
+        header: 'Fix Status',
+        get: (row: any) => {
+          return row.fixStatus === 'Fixed' ? chalk.greenBright(row.fixStatus) : chalk.redBright(row.fixStatus);
+        },
+      },
+    };
+  }
+
+  /**
+   * The `start` function performs an audit on content types, global fields, and entries, and displays
+   * any missing references.
+   * @param {string} command - The `command` parameter is a string that represents the current command
+   * being executed.
+   */
+  async start(command: string): Promise<void> {
+    this.currentCommand = command;
+    await this.promptQueue();
+    await this.createBackUp();
+    this.sharedConfig.reportPath = resolve(this.flags['report-path'] || process.cwd(), 'audit-report');
+
+    const { missingCtRefs, missingGfRefs, missingEntryRefs } = await this.scanAndFix();
+
+    this.showOutputOnScreen([
+      { module: 'Content types', missingRefs: missingCtRefs },
+      { module: 'Global Fields', missingRefs: missingGfRefs },
+      { module: 'Entries', missingRefs: missingEntryRefs },
+    ]);
+
+    if (!isEmpty(missingCtRefs) || !isEmpty(missingGfRefs) || !isEmpty(missingEntryRefs)) {
+      if (this.currentCommand === 'cm:stacks:audit') {
+        this.log(this.$t(auditMsg.FINAL_REPORT_PATH, { path: this.sharedConfig.reportPath }), 'warn');
+      } else {
+        this.log(this.$t(this.messages.FIXED_CONTENT_PATH_MAG, { path: this.sharedConfig.basePath }), 'warn');
+      }
+    } else {
+      this.log(this.messages.NO_MISSING_REF_FOUND, 'info');
+      this.log('');
+    }
+  }
+
+  /**
+   * The `scan` function performs an audit on different modules (content-types, global-fields, and
+   * entries) and returns the missing references for each module.
+   * @returns The function `scan()` returns an object with properties `missingCtRefs`, `missingGfRefs`,
+   * and `missingEntryRefs`.
+   */
+  async scanAndFix() {
+    let { ctSchema, gfSchema } = this.getCtAndGfSchema();
+    let missingCtRefs, missingGfRefs, missingEntryRefs;
+    for (const module of this.sharedConfig.flags.modules || this.sharedConfig.modules) {
+      ux.action.start(this.$t(this.messages.AUDIT_START_SPINNER, { module }));
+
+      const constructorParam = {
+        ctSchema,
+        gfSchema,
+        log: this.log,
+        moduleName: module,
+        config: this.sharedConfig,
+        fix: this.currentCommand === 'cm:stacks:audit:fix',
+      };
+
+      switch (module) {
+        case 'content-types':
+          missingCtRefs = await new ContentType(cloneDeep(constructorParam)).run();
+          await this.prepareReport(module, missingCtRefs);
+          break;
+        case 'global-fields':
+          missingGfRefs = await new GlobalField(cloneDeep(constructorParam)).run();
+          await this.prepareReport(module, missingGfRefs);
+          break;
+        case 'entries':
+          missingEntryRefs = await new Entries(cloneDeep(constructorParam)).run();
+          await this.prepareReport(module, missingEntryRefs);
+          break;
+      }
+
+      ux.action.stop();
+    }
+
+    return { missingCtRefs, missingGfRefs, missingEntryRefs };
+  }
+
+  /**
+   * The `promptQueue` function prompts the user to enter a data directory path if the `data-dir` flag
+   * is missing, and sets the `basePath` property of the `sharedConfig` object to the entered path.
+   */
+  async promptQueue() {
+    // NOTE get content path if data-dir flag is missing
+    this.sharedConfig.basePath =
+      this.flags['data-dir'] ||
+      (await cliux.inquire<string>({
+        type: 'input',
+        name: 'data-dir',
+        message: this.messages.DATA_DIR,
+      }));
+  }
+
+  /**
+   * The function `createBackUp` creates a backup of data if the `copy-dir` flag is set, and throws
+   * an error if the specified path does not exist.
+   */
+  async createBackUp() {
+    if (this.currentCommand === 'cm:stacks:audit:fix' && this.flags['copy-dir']) {
+      if (!existsSync(this.sharedConfig.basePath)) {
+        throw Error(this.$t(this.messages.NOT_VALID_PATH, { path: this.sharedConfig.basePath }));
+      }
+
+      // NOTE create bkp directory
+      const backupDirPath = `${(this.flags['copy-path'] || this.flags['data-dir']).replace(
+        /\/+$/,
+        '',
+      )}_backup_${uuid()}`;
+
+      if (!existsSync(backupDirPath)) {
+        mkdirSync(backupDirPath, { recursive: true });
+      }
+
+      await copy(this.sharedConfig.basePath, backupDirPath);
+
+      this.sharedConfig.basePath = backupDirPath;
+    }
+  }
+
+  /**
+   * The function `getCtAndGfSchema` reads and parses JSON files containing content type and global
+   * field schemas, and returns them as an object.
+   * @returns The function `getCtAndGfSchema()` returns an object with two properties: `ctSchema` and
+   * `gfSchema`. The values of these properties are the parsed JSON data from two different files.
+   */
+  getCtAndGfSchema() {
+    const modules = this.sharedConfig.flags.modules || this.sharedConfig.modules;
+    const ctPath = join(
+      this.sharedConfig.basePath,
+      this.sharedConfig.moduleConfig['content-types'].dirName,
+      this.sharedConfig.moduleConfig['content-types'].fileName,
+    );
+    const gfPath = join(
+      this.sharedConfig.basePath,
+      this.sharedConfig.moduleConfig['global-fields'].dirName,
+      this.sharedConfig.moduleConfig['global-fields'].fileName,
+    );
+
+    if (modules.includes('content-types')) {
+      if (!existsSync(ctPath)) {
+        this.log(this.$t(auditMsg.NOT_VALID_PATH, { path: ctPath }), 'error');
+      }
+    }
+
+    if (modules.includes('global-fields')) {
+      if (!existsSync(gfPath)) {
+        this.log(this.$t(auditMsg.NOT_VALID_PATH, { path: ctPath }), 'error');
+      }
+    }
+
+    let gfSchema = existsSync(gfPath) ? (JSON.parse(readFileSync(gfPath, 'utf-8')) as ContentTypeStruct[]) : [];
+    let ctSchema = existsSync(ctPath) ? (JSON.parse(readFileSync(ctPath, 'utf-8')) as ContentTypeStruct[]) : [];
+
+    return { ctSchema, gfSchema };
+  }
+
+  /**
+   * The function `showOutputOnScreen` displays missing references on the terminal screen if the
+   * `showTerminalOutput` flag is set to true.
+   * @param {{ module: string; missingRefs?: Record<string, any> }[]} allMissingRefs - An array of
+   * objects, where each object has two properties:
+   */
+  showOutputOnScreen(allMissingRefs: { module: string; missingRefs?: Record<string, any> }[]) {
+    if (this.sharedConfig.showTerminalOutput) {
+      this.log(''); // NOTE adding new line
+      for (const { module, missingRefs } of allMissingRefs) {
+        if (!isEmpty(missingRefs)) {
+          print([
+            {
+              bold: true,
+              color: 'cyan',
+              message: ` ${module}`,
+            },
+          ]);
+          const tableValues = Object.values(missingRefs).flat();
+
+          ux.table(
+            tableValues,
+            {
+              name: {
+                minWidth: 7,
+                header: 'Title',
+              },
+              display_name: {
+                minWidth: 7,
+                header: 'Field name',
+              },
+              data_type: {
+                minWidth: 7,
+                header: 'Field type',
+              },
+              missingRefs: {
+                minWidth: 7,
+                header: 'Missing references',
+                get: (row) => {
+                  return chalk.red(
+                    typeof row.missingRefs === 'object' ? JSON.stringify(row.missingRefs) : row.missingRefs,
+                  );
+                },
+              },
+              ...(tableValues[0]?.fixStatus ? this.fixStatus : {}),
+              treeStr: {
+                minWidth: 7,
+                header: 'Path',
+              },
+            },
+            {
+              ...this.flags,
+            },
+          );
+          this.log(''); // NOTE adding new line
+        }
+      }
+    }
+  }
+
+  /**
+   * The function prepares a report by writing a JSON file and a CSV file with a list of missing
+   * references for a given module.
+   * @param moduleName - The `moduleName` parameter is a string that represents the name of a module.
+   * It is used to generate the filename for the report.
+   * @param listOfMissingRefs - The `listOfMissingRefs` parameter is a record object that contains
+   * information about missing references. It is a key-value pair where the key represents the
+   * reference name and the value represents additional information about the missing reference.
+   * @returns The function `prepareReport` returns a Promise that resolves to `void`.
+   */
+  prepareReport(moduleName: keyof typeof config.moduleConfig, listOfMissingRefs: Record<string, any>): Promise<void> {
+    if (isEmpty(listOfMissingRefs)) return Promise.resolve(void 0);
+
+    if (!existsSync(this.sharedConfig.reportPath)) {
+      mkdirSync(this.sharedConfig.reportPath, { recursive: true });
+    }
+
+    // NOTE write int json
+    writeFileSync(join(this.sharedConfig.reportPath, `${moduleName}.json`), JSON.stringify(listOfMissingRefs));
+
+    // NOTE write into CSV
+    return this.prepareCSV(moduleName, listOfMissingRefs);
+  }
+
+  /**
+   * The function `prepareCSV` takes a module name and a list of missing references, and generates a
+   * CSV file with the specified columns and filtered rows.
+   * @param moduleName - The `moduleName` parameter is a string that represents the name of a module.
+   * It is used to generate the name of the CSV file that will be created.
+   * @param listOfMissingRefs - The `listOfMissingRefs` parameter is a record object that contains
+   * information about missing references. Each key in the record represents a reference, and the
+   * corresponding value is an array of objects that contain details about the missing reference.
+   * @returns The function `prepareCSV` returns a Promise that resolves to `void`.
+   */
+  prepareCSV(moduleName: keyof typeof config.moduleConfig, listOfMissingRefs: Record<string, any>): Promise<void> {
+    const csvStream = csv.format({ headers: true });
+    const csvPath = join(this.sharedConfig.reportPath, `${moduleName}.csv`);
+    const assetFileStream = createWriteStream(csvPath);
+    assetFileStream.on('error', (error) => {
+      throw error;
+    });
+
+    return new Promise<void>((resolve, reject) => {
+      csvStream.pipe(assetFileStream).on('close', resolve).on('error', reject);
+      const defaultColumns = Object.keys(OutputColumn);
+      const userDefinedColumns = this.sharedConfig.flags.columns ? this.sharedConfig.flags.columns.split(',') : null;
+      let missingRefs: RefErrorReturnType[] = Object.values(listOfMissingRefs).flat();
+      const columns: (keyof typeof OutputColumn)[] = userDefinedColumns
+        ? [...userDefinedColumns, ...defaultColumns.filter((val: string) => !userDefinedColumns.includes(val))]
+        : defaultColumns;
+
+      if (this.sharedConfig.flags.filter) {
+        const [column, value]: [keyof typeof OutputColumn, string] = this.sharedConfig.flags.filter.split('=');
+        missingRefs = missingRefs.filter((row: RefErrorReturnType) => row[OutputColumn[column]] === value);
+      }
+
+      for (const issue of missingRefs) {
+        let row: Record<string, string | string[]> = {};
+
+        for (const column of columns) {
+          row[column] = issue[OutputColumn[column]];
+          row[column] = typeof row[column] === 'object' ? JSON.stringify(row[column]) : row[column];
+        }
+
+        if (this.currentCommand === 'cm:stacks:audit:fix') {
+          row['Fix status'] = row.fixStatus;
+        }
+
+        csvStream.write(row);
+      }
+
+      csvStream.end();
+    });
+  }
+}
diff --git a/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts b/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts
index 28412ae0af..3d5a197eb0 100644
--- a/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts
+++ b/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts
@@ -1,13 +1,64 @@
-import { BaseCommand } from '../../../../base-command';
+import { FlagInput, Flags, ux } from '@contentstack/cli-utilities';
 
-export default class AuditFix extends BaseCommand<typeof AuditFix> {
-  static description = 'Audit fix command';
+import config from '../../../../config';
+import { auditFixMsg, auditMsg } from '../../../../messages';
+import { AuditBaseCommand } from '../../../../audit-base-command';
 
-  static aliases: string[] = ['cm::stacks:audit:fix'];
+export default class AuditFix extends AuditBaseCommand {
+  static aliases: string[] = ['audit:fix', 'cm:stacks:audit:fix'];
 
-  static examples = ['$ <%= config.bin %> <%= command.id %>'];
+  static description = auditFixMsg.AUDIT_FIX_CMD_DESCRIPTION;
 
-  static flags = {};
+  static examples = [
+    '$ <%= config.bin %> <%= command.id %> --copy-dir',
+    '$ <%= config.bin %> <%= command.id %> --report-path=<path> --copy-dir',
+    '$ <%= config.bin %> <%= command.id %> --report-path=<path> --copy-dir --csv',
+    '$ <%= config.bin %> <%= command.id %> --report-path=<path> --filter="name=<filter-value>"',
+    '$ <%= config.bin %> <%= command.id %> --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>',
+  ];
 
-  async run(): Promise<void> {}
+  static flags: FlagInput = {
+    'report-path': Flags.string({
+      description: auditMsg.REPORT_PATH,
+    }),
+    'reference-only': Flags.boolean({
+      hidden: true,
+      description: auditMsg.REFERENCE_ONLY,
+    }),
+    modules: Flags.string({
+      multiple: true,
+      options: config.modules,
+      description: auditMsg.MODULES,
+    }),
+    'copy-dir': Flags.boolean({
+      description: auditFixMsg.COPY_DATA,
+    }),
+    'copy-path': Flags.string({
+      dependsOn: ['copy-dir'],
+      description: auditFixMsg.BKP_PATH,
+    }),
+    yes: Flags.boolean({
+      char: 'y',
+      hidden: true,
+      description: 'Use this flag to skip confirmation',
+    }),
+    ...ux.table.flags({
+      only: ['columns', 'sort', 'filter', 'csv', 'no-truncate'],
+    }),
+  };
+
+  /**
+   * The `run` function is an asynchronous function that performs an audit on different modules
+   * (content-types, global-fields, entries) and generates a report.
+   */
+  async run(): Promise<void> {
+    try {
+      await this.start('cm:stacks:audit:fix');
+    } catch (error) {
+      this.log(error instanceof Error ? error.message : error, 'error');
+      console.trace(error);
+      ux.action.stop('Process failed.!');
+      this.exit(1);
+    }
+  }
 }
diff --git a/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts b/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts
index 5df9cd7ef2..065d1e91d1 100644
--- a/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts
+++ b/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts
@@ -1,21 +1,13 @@
-import chalk from 'chalk';
-import * as csv from 'fast-csv';
-import isEmpty from 'lodash/isEmpty';
-import { join, resolve } from 'path';
-import { FlagInput, Flags, cliux, ux } from '@contentstack/cli-utilities';
-import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { FlagInput, Flags, ux } from '@contentstack/cli-utilities';
 
 import config from '../../../../config';
-import { print } from '../../../../util/log';
 import { auditMsg } from '../../../../messages';
-import { BaseCommand } from '../../../../base-command';
-import { Entries, GlobalField, ContentType } from '../../../../modules';
-import { ContentTypeStruct, OutputColumn, RefErrorReturnType } from '../../../../types';
+import { AuditBaseCommand } from '../../../../audit-base-command';
 
-export default class Audit extends BaseCommand<typeof Audit> {
-  static aliases: string[] = ['cm:stacks:audit'];
+export default class Audit extends AuditBaseCommand {
+  static aliases: string[] = ['audit', 'cm:stacks:audit'];
 
-  static description = 'Perform audits and find possible errors in the exported Contentstack data';
+  static description = auditMsg.AUDIT_CMD_DESCRIPTION;
 
   static examples = [
     '$ <%= config.bin %> <%= command.id %>',
@@ -49,65 +41,7 @@ export default class Audit extends BaseCommand<typeof Audit> {
    */
   async run(): Promise<void> {
     try {
-      await this.promptQueue();
-      const reportPath = this.flags['report-path'] || process.cwd();
-      this.sharedConfig.reportPath = resolve(reportPath, 'audit-report');
-      let { ctSchema, gfSchema } = this.getCtAndGfSchema();
-      let missingCtRefs, missingGfRefs, missingEntryRefs;
-
-      for (const module of this.sharedConfig.flags.modules || this.sharedConfig.modules) {
-        ux.action.start(this.$t(this.messages.AUDIT_START_SPINNER, { module }));
-
-        switch (module) {
-          case 'content-types':
-            missingCtRefs = await new ContentType({
-              ctSchema,
-              gfSchema,
-              log: this.log,
-              moduleName: module,
-              config: this.sharedConfig,
-            }).run();
-
-            await this.prepareReport(module, missingCtRefs);
-            break;
-          case 'global-fields':
-            missingGfRefs = await new GlobalField({
-              ctSchema,
-              gfSchema,
-              log: this.log,
-              moduleName: module,
-              config: this.sharedConfig,
-            }).run();
-
-            await this.prepareReport(module, missingGfRefs);
-            break;
-          case 'entries':
-            missingEntryRefs = await new Entries({
-              ctSchema,
-              gfSchema,
-              log: this.log,
-              moduleName: module,
-              config: this.sharedConfig,
-            }).run();
-            await this.prepareReport(module, missingEntryRefs);
-            break;
-        }
-
-        ux.action.stop();
-      }
-
-      this.showOutputOnScreen([
-        { module: 'Content types', missingRefs: missingCtRefs },
-        { module: 'Global Fields', missingRefs: missingGfRefs },
-        { module: 'Entries', missingRefs: missingEntryRefs },
-      ]);
-
-      if (!isEmpty(missingCtRefs) || !isEmpty(missingGfRefs) || !isEmpty(missingEntryRefs)) {
-        this.log(this.$t(auditMsg.FINAL_REPORT_PATH, { path: this.sharedConfig.reportPath }), 'warn');
-      } else {
-        this.log(this.messages.NO_MISSING_REF_FOUND, 'info');
-        this.log('');
-      }
+      await this.start('cm:stacks:audit');
     } catch (error) {
       this.log(error instanceof Error ? error.message : error, 'error');
       console.trace(error);
@@ -115,170 +49,4 @@ export default class Audit extends BaseCommand<typeof Audit> {
       this.exit(1);
     }
   }
-
-  /**
-   * The `promptQueue` function prompts the user to enter a data directory path if the `data-dir` flag
-   * is missing, and sets the `basePath` property of the `sharedConfig` object to the entered path.
-   */
-  async promptQueue() {
-    // NOTE get content path if data-dir flag is missing
-    this.sharedConfig.basePath =
-      this.flags['data-dir'] ||
-      (await cliux.inquire<string>({
-        type: 'input',
-        name: 'data-dir',
-        message: this.messages.DATA_DIR,
-      }));
-  }
-
-  /**
-   * The function `getCtAndGfSchema` reads and parses JSON files containing content type and global
-   * field schemas, and returns them as an object.
-   * @returns The function `getCtAndGfSchema()` returns an object with two properties: `ctSchema` and
-   * `gfSchema`. The values of these properties are the parsed JSON data from two different files.
-   */
-  getCtAndGfSchema() {
-    const ctPath = join(
-      this.sharedConfig.basePath,
-      this.sharedConfig.moduleConfig['content-types'].dirName,
-      this.sharedConfig.moduleConfig['content-types'].fileName,
-    );
-    const gfPath = join(
-      this.sharedConfig.basePath,
-      this.sharedConfig.moduleConfig['global-fields'].dirName,
-      this.sharedConfig.moduleConfig['global-fields'].fileName,
-    );
-    let ctSchema = existsSync(ctPath) ? (JSON.parse(readFileSync(ctPath, 'utf-8')) as ContentTypeStruct[]) : [];
-    let gfSchema = existsSync(gfPath) ? (JSON.parse(readFileSync(gfPath, 'utf-8')) as ContentTypeStruct[]) : [];
-
-    return { ctSchema, gfSchema };
-  }
-
-  /**
-   * The function `showOutputOnScreen` displays missing references on the terminal screen if the
-   * `showTerminalOutput` flag is set to true.
-   * @param {{ module: string; missingRefs?: Record<string, any> }[]} allMissingRefs - An array of
-   * objects, where each object has two properties:
-   */
-  showOutputOnScreen(allMissingRefs: { module: string; missingRefs?: Record<string, any> }[]) {
-    if (this.sharedConfig.showTerminalOutput) {
-      this.log(''); // NOTE adding new line
-      for (const { module, missingRefs } of allMissingRefs) {
-        if (!isEmpty(missingRefs)) {
-          print([
-            {
-              bold: true,
-              color: 'cyan',
-              message: ` ${module}`,
-            },
-          ]);
-          ux.table(
-            Object.values(missingRefs).flat(),
-            {
-              name: {
-                minWidth: 7,
-                header: 'Title',
-              },
-              display_name: {
-                minWidth: 7,
-                header: 'Field name',
-              },
-              data_type: {
-                minWidth: 7,
-                header: 'Field type',
-              },
-              missingRefs: {
-                minWidth: 7,
-                header: 'Missing references',
-                get: (row) => {
-                  return chalk.red(
-                    typeof row.missingRefs === 'object' ? JSON.stringify(row.missingRefs) : row.missingRefs,
-                  );
-                },
-              },
-              treeStr: {
-                minWidth: 7,
-                header: 'Path',
-              },
-            },
-            {
-              ...this.flags,
-            },
-          );
-          this.log(''); // NOTE adding new line
-        }
-      }
-    }
-  }
-
-  /**
-   * The function prepares a report by writing a JSON file and a CSV file with a list of missing
-   * references for a given module.
-   * @param moduleName - The `moduleName` parameter is a string that represents the name of a module.
-   * It is used to generate the filename for the report.
-   * @param listOfMissingRefs - The `listOfMissingRefs` parameter is a record object that contains
-   * information about missing references. It is a key-value pair where the key represents the
-   * reference name and the value represents additional information about the missing reference.
-   * @returns The function `prepareReport` returns a Promise that resolves to `void`.
-   */
-  prepareReport(moduleName: keyof typeof config.moduleConfig, listOfMissingRefs: Record<string, any>): Promise<void> {
-    if (isEmpty(listOfMissingRefs)) return Promise.resolve(void 0);
-
-    if (!existsSync(this.sharedConfig.reportPath)) {
-      mkdirSync(this.sharedConfig.reportPath, { recursive: true });
-    }
-
-    // NOTE write int json
-    writeFileSync(join(this.sharedConfig.reportPath, `${moduleName}.json`), JSON.stringify(listOfMissingRefs));
-
-    // NOTE write into CSV
-    return this.prepareCSV(moduleName, listOfMissingRefs);
-  }
-
-  /**
-   * The function `prepareCSV` takes a module name and a list of missing references, and generates a
-   * CSV file with the specified columns and filtered rows.
-   * @param moduleName - The `moduleName` parameter is a string that represents the name of a module.
-   * It is used to generate the name of the CSV file that will be created.
-   * @param listOfMissingRefs - The `listOfMissingRefs` parameter is a record object that contains
-   * information about missing references. Each key in the record represents a reference, and the
-   * corresponding value is an array of objects that contain details about the missing reference.
-   * @returns The function `prepareCSV` returns a Promise that resolves to `void`.
-   */
-  prepareCSV(moduleName: keyof typeof config.moduleConfig, listOfMissingRefs: Record<string, any>): Promise<void> {
-    const csvStream = csv.format({ headers: true });
-    const csvPath = join(this.sharedConfig.reportPath, `${moduleName}.csv`);
-    const assetFileStream = createWriteStream(csvPath);
-    assetFileStream.on('error', (error) => {
-      throw error;
-    });
-
-    return new Promise<void>((resolve, reject) => {
-      csvStream.pipe(assetFileStream).on('close', resolve).on('error', reject);
-      const defaultColumns = Object.keys(OutputColumn);
-      const userDefinedColumns = this.sharedConfig.flags.columns ? this.sharedConfig.flags.columns.split(',') : null;
-      let missingRefs: RefErrorReturnType[] = Object.values(listOfMissingRefs).flat();
-      const columns: (keyof typeof OutputColumn)[] = userDefinedColumns
-        ? [...userDefinedColumns, ...defaultColumns.filter((val: string) => !userDefinedColumns.includes(val))]
-        : defaultColumns;
-
-      if (this.sharedConfig.flags.filter) {
-        const [column, value]: [keyof typeof OutputColumn, string] = this.sharedConfig.flags.filter.split('=');
-        missingRefs = missingRefs.filter((row: RefErrorReturnType) => row[OutputColumn[column]] === value);
-      }
-
-      for (const issue of missingRefs) {
-        let row: Record<string, string | string[]> = {};
-
-        for (const column of columns) {
-          row[column] = issue[OutputColumn[column]];
-          row[column] = typeof row[column] === 'object' ? JSON.stringify(row[column]) : row[column];
-        }
-
-        csvStream.write(row);
-      }
-
-      csvStream.end();
-    });
-  }
 }
diff --git a/packages/contentstack-audit/src/messages/index.ts b/packages/contentstack-audit/src/messages/index.ts
index 72e850cc3e..98cfd8f112 100644
--- a/packages/contentstack-audit/src/messages/index.ts
+++ b/packages/contentstack-audit/src/messages/index.ts
@@ -1,16 +1,14 @@
-const errors = {
-  NOT_EMPTY: '{value} cannot be empty.',
-};
+const errors = {};
 
 const commonMsg = {
-  CONFIG: 'Path of the external config.',
-  CURRENT_WORKING_DIR: 'Current working directory.',
-  DATA_DIR: 'Path where the data is stored.',
+  CONFIG: 'Path of the external config',
+  DATA_DIR: 'Path where the data is stored',
+  FIX_CONFIRMATION: 'Would you like to overwrite existing file.?',
 };
 
 const auditMsg = {
-  REPORT_PATH: 'Path to store the audit reports.',
-  MODULES: 'Provide the list of modules to be audited.',
+  REPORT_PATH: 'Path to store the audit reports',
+  MODULES: 'Provide the list of modules to be audited',
   AUDIT_START_SPINNER: '{module} scanning...',
   PREPARING_ENTRY_METADATA: 'Creating entry metadata...',
   REFERENCE_ONLY: 'Checks only for missing references.',
@@ -19,12 +17,22 @@ const auditMsg = {
   FINAL_REPORT_PATH: "Reports ready. Please find the reports at '{path}'.",
   SCAN_CT_SUCCESS_MSG: "Successfully completed the scanning of {module} '{title}'.",
   SCAN_ENTRY_SUCCESS_MSG: "Successfully completed the scanning of {module} ({local}) '{title}'.",
+  AUDIT_CMD_DESCRIPTION: 'Perform audits and find possible errors in the exported Contentstack data',
+};
+
+const auditFixMsg = {
+  COPY_DATA: 'Create backup from the original data.',
+  BKP_PATH: 'Provide the path to backup the copied data',
+  FIXED_CONTENT_PATH_MAG: 'You can locate the fixed content at {path}.',
+  EMPTY_FIX_MSG: 'Successfully removed the empty field/block found at {path} from the schema.',
+  AUDIT_FIX_CMD_DESCRIPTION: 'Perform audits and fix possible errors in the exported Contentstack data.',
 };
 
-const messages: typeof errors & typeof commonMsg & typeof auditMsg = {
+const messages: typeof errors & typeof commonMsg & typeof auditMsg & typeof auditFixMsg = {
   ...errors,
   ...commonMsg,
   ...auditMsg,
+  ...auditFixMsg,
 };
 
 /**
@@ -47,4 +55,4 @@ function $t(msg: string, args: Record<string, string>): string {
 }
 
 export default messages;
-export { $t, errors, commonMsg, auditMsg };
+export { $t, errors, commonMsg, auditMsg, auditFixMsg };
diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
index a635372847..6cc957c66f 100644
--- a/packages/contentstack-audit/src/modules/content-types.ts
+++ b/packages/contentstack-audit/src/modules/content-types.ts
@@ -1,6 +1,8 @@
-import { resolve } from 'path';
 import find from 'lodash/find';
-import { existsSync } from 'fs';
+import { ux } from '@oclif/core';
+import isEmpty from 'lodash/isEmpty';
+import { join, resolve } from 'path';
+import { existsSync, writeFileSync } from 'fs';
 
 import {
   LogFn,
@@ -15,14 +17,16 @@ import {
   ModularBlocksDataType,
   ModuleConstructorParam,
   ReferenceFieldDataType,
+  ContentTypeSchemaType,
 } from '../types';
 import auditConfig from '../config';
-import { $t, auditMsg } from '../messages';
+import { $t, auditFixMsg, auditMsg, commonMsg } from '../messages';
 
 /* The `ContentType` class is responsible for scanning content types, looking for references, and
 generating a report in JSON and CSV formats. */
 export default class ContentType {
   public log: LogFn;
+  protected fix: boolean;
   public fileName: string;
   public config: ConfigType;
   public folderPath: string;
@@ -32,17 +36,17 @@ export default class ContentType {
   public ctSchema: ContentTypeStruct[];
   protected schema: ContentTypeStruct[] = [];
   protected missingRefs: Record<string, any> = {};
-  public moduleName: keyof typeof auditConfig.moduleConfig = 'content-types';
+  public moduleName: keyof typeof auditConfig.moduleConfig;
 
-  constructor({ log, config, moduleName, ctSchema, gfSchema }: ModuleConstructorParam & CtConstructorParam) {
+  constructor({ log, fix, config, moduleName, ctSchema, gfSchema }: ModuleConstructorParam & CtConstructorParam) {
     this.log = log;
     this.config = config;
+    this.fix = fix ?? false;
     this.ctSchema = ctSchema;
     this.gfSchema = gfSchema;
     this.moduleName = moduleName ?? 'content-types';
     this.fileName = config.moduleConfig[this.moduleName].fileName;
     this.folderPath = resolve(config.basePath, config.moduleConfig[this.moduleName].dirName);
-
   }
 
   /**
@@ -50,7 +54,7 @@ export default class ContentType {
    * iterates over the schema and looks for references, and returns a list of missing references.
    * @returns the `missingRefs` object.
    */
-  async run() {
+  async run(returnFixSchema = false) {
     if (!existsSync(this.folderPath)) {
       throw new Error($t(auditMsg.NOT_VALID_PATH, { path: this.folderPath }));
     }
@@ -69,6 +73,14 @@ export default class ContentType {
       );
     }
 
+    if (returnFixSchema) {
+      return this.schema;
+    }
+
+    if (this.fix) {
+      await this.writeFixContent();
+    }
+
     for (let propName in this.missingRefs) {
       if (!this.missingRefs[propName].length) {
         delete this.missingRefs[propName];
@@ -78,6 +90,25 @@ export default class ContentType {
     return this.missingRefs;
   }
 
+  /**
+   * The function checks if it can write the fix content to a file and if so, it writes the content as
+   * JSON to the specified file path.
+   */
+  async writeFixContent() {
+    let canWrite = true;
+
+    if (this.fix && !this.config.flags['copy-dir']) {
+      canWrite = this.config.flags.yes || (await ux.confirm(commonMsg.FIX_CONFIRMATION));
+    }
+
+    if (canWrite) {
+      writeFileSync(
+        join(this.folderPath, this.config.moduleConfig[this.moduleName].fileName),
+        JSON.stringify(this.schema),
+      );
+    }
+  }
+
   /**
    * The function `lookForReference` iterates through a given schema and performs validation checks
    * based on the data type of each field.
@@ -91,47 +122,51 @@ export default class ContentType {
    */
   async lookForReference(
     tree: Record<string, unknown>[],
-    { schema }: ContentTypeStruct | GlobalFieldDataType | ModularBlockType | GroupFieldDataType,
+    field: ContentTypeStruct | GlobalFieldDataType | ModularBlockType | GroupFieldDataType,
   ): Promise<void> {
-    for (const field of schema ?? []) {
-      switch (field.data_type) {
+    if (this.fix) {
+      field.schema = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[]);
+    }
+
+    for (let child of field.schema ?? []) {
+      switch (child.data_type) {
         case 'reference':
           this.missingRefs[this.currentUid].push(
             ...this.validateReferenceField(
-              [...tree, { uid: field.uid, name: field.display_name }],
-              field as ReferenceFieldDataType,
+              [...tree, { uid: field.uid, name: child.display_name }],
+              child as ReferenceFieldDataType,
             ),
           );
           break;
         case 'global_field':
           await this.validateGlobalField(
-            [...tree, { uid: field.uid, name: field.display_name }],
-            field as GlobalFieldDataType,
+            [...tree, { uid: child.uid, name: child.display_name }],
+            child as GlobalFieldDataType,
           );
           break;
         case 'json':
-          if (field.field_metadata.extension) {
+          if (child.field_metadata.extension) {
             // NOTE Custom field type
-          } else if (field.field_metadata.allow_json_rte) {
+          } else if (child.field_metadata.allow_json_rte) {
             // NOTE JSON RTE field type
             this.missingRefs[this.currentUid].push(
               ...this.validateJsonRTEFields(
-                [...tree, { uid: field.uid, name: field.display_name }],
-                field as ReferenceFieldDataType,
+                [...tree, { uid: child.uid, name: child.display_name }],
+                child as ReferenceFieldDataType,
               ),
             );
           }
           break;
         case 'blocks':
           await this.validateModularBlocksField(
-            [...tree, { uid: field.uid, name: field.display_name }],
-            field as ModularBlocksDataType,
+            [...tree, { uid: child.uid, name: child.display_name }],
+            child as ModularBlocksDataType,
           );
           break;
         case 'group':
           await this.validateGroupField(
-            [...tree, { uid: field.uid, name: field.display_name }],
-            field as GroupFieldDataType,
+            [...tree, { uid: child.uid, name: child.display_name }],
+            child as GroupFieldDataType,
           );
           break;
       }
@@ -161,25 +196,6 @@ export default class ContentType {
    */
   async validateGlobalField(tree: Record<string, unknown>[], field: GlobalFieldDataType): Promise<void> {
     // NOTE Any GlobalField related logic can be added here
-    const missingRefs = [];
-    const { reference_to, display_name, data_type } = field;
-
-    if (!find(this.gfSchema, { uid: reference_to })) {
-      missingRefs.push(reference_to);
-    }
-
-    if (missingRefs.length) {
-      this.missingRefs[this.currentUid].push({
-        tree,
-        data_type,
-        missingRefs,
-        display_name,
-        ct_uid: this.currentUid,
-        name: this.currentTitle,
-        treeStr: tree.map(({ name }) => name).join(' ➜ '),
-      });
-    }
-
     await this.lookForReference(tree, field);
   }
 
@@ -209,8 +225,8 @@ export default class ContentType {
    */
   async validateModularBlocksField(tree: Record<string, unknown>[], field: ModularBlocksDataType): Promise<void> {
     const { blocks } = field;
+    this.fixModularBlocksReferences(tree, blocks);
 
-    // NOTE Traverse each and every module and look for reference
     for (const block of blocks) {
       const { uid, title } = block;
 
@@ -247,8 +263,10 @@ export default class ContentType {
     tree: Record<string, unknown>[],
     field: ReferenceFieldDataType | JsonRTEFieldDataType,
   ): RefErrorReturnType[] {
-    const missingRefs = [];
-    const { reference_to, display_name, data_type } = field;
+    if (this.fix) return [];
+
+    const missingRefs: string[] = [];
+    let { reference_to, display_name, data_type } = field;
 
     for (const reference of reference_to ?? []) {
       // NOTE Can skip specific references keys (Ex, system defined keys can be skipped)
@@ -270,9 +288,237 @@ export default class ContentType {
             display_name,
             ct_uid: this.currentUid,
             name: this.currentTitle,
-            treeStr: tree.map(({ name }) => name).join(' ➜ '),
+            treeStr: tree
+              .map(({ name }) => name)
+              .filter((val) => val)
+              .join(' ➜ '),
           },
         ]
       : [];
   }
+
+  /**
+   * The function `runFixOnSchema` takes in a tree and a schema, and performs various fixes on the
+   * schema based on the data types of the fields.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing the tree structure of
+   * the schema.
+   * @param {ContentTypeSchemaType[]} schema - The `schema` parameter is an array of
+   * `ContentTypeSchemaType` objects. Each object represents a field in a content type schema and
+   * contains properties such as `data_type`, `field_metadata`, `uid`, `name`, etc.
+   * @returns an array of ContentTypeSchemaType objects.
+   */
+  runFixOnSchema(tree: Record<string, unknown>[], schema: ContentTypeSchemaType[]) {
+    // NOTE Global field Fix
+    return schema
+      .map((field) => {
+        const { data_type } = field;
+        switch (data_type) {
+          case 'global_field':
+            return this.fixGlobalFieldReferences(tree, field as GlobalFieldDataType);
+          case 'json':
+          case 'reference':
+            if (data_type === 'json') {
+              if (field.field_metadata.extension) {
+                // NOTE Custom field type
+                return field;
+              } else if (field.field_metadata.allow_json_rte) {
+                return this.fixMissingReferences(tree, field as JsonRTEFieldDataType);
+              }
+            }
+
+            return this.fixMissingReferences(tree, field as ReferenceFieldDataType);
+          case 'blocks':
+            (field as ModularBlocksDataType).blocks = this.fixModularBlocksReferences(
+              [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
+              (field as ModularBlocksDataType).blocks,
+            );
+            if (isEmpty((field as ModularBlocksDataType).blocks)) {
+              return null;
+            }
+            return field;
+          case 'group':
+            return this.fixGroupField(tree, field as GroupFieldDataType);
+          default:
+            return field;
+        }
+      })
+      .filter((val: any) => {
+        if (val?.schema && isEmpty(val.schema)) return false;
+        if (val?.reference_to && isEmpty(val.reference_to)) return false;
+
+        return !!val;
+      }) as ContentTypeSchemaType[];
+  }
+
+  /**
+   * The function fixes global field references in a tree structure by adding missing references and
+   * returning the field if the reference exists, otherwise returning null.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {GlobalFieldDataType} field - The `field` parameter is an object that represents a global
+   * field. It has the following properties:
+   * @returns either the `field` object if `reference_to` exists in `this.gfSchema`, or `null` if it
+   * doesn't.
+   */
+  fixGlobalFieldReferences(tree: Record<string, unknown>[], field: GlobalFieldDataType) {
+    const { reference_to, display_name, data_type } = field;
+    if (reference_to && data_type === 'global_field') {
+      tree = [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }];
+      const refExist = find(this.gfSchema, { uid: reference_to });
+
+      if (!refExist) {
+        this.missingRefs[this.currentUid].push({
+          tree,
+          data_type,
+          display_name,
+          fixStatus: 'Fixed',
+          missingRefs: [reference_to],
+          ct_uid: this.currentUid,
+          name: this.currentTitle,
+          treeStr: tree.map(({ name }) => name).join(' ➜ '),
+        });
+      }
+
+      return refExist ? field : null;
+    }
+
+    return field;
+  }
+
+  /**
+   * The function `fixModularBlocksReferences` takes in an array of tree objects and an array of
+   * modular blocks, and returns an array of modular blocks with fixed references.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing the tree structure.
+   * @param {ModularBlockType[]} blocks - An array of objects representing modular blocks. Each object
+   * has properties such as "reference_to", "schema", "title", and "uid".
+   * @returns an array of `ModularBlockType` objects.
+   */
+  fixModularBlocksReferences(tree: Record<string, unknown>[], blocks: ModularBlockType[]) {
+    return blocks
+      .map((block) => {
+        const { reference_to, schema, title: display_name } = block;
+        tree = [...tree, { uid: block.uid, name: block.title }];
+        const refErrorObj = {
+          tree,
+          display_name,
+          fixStatus: 'Fixed',
+          missingRefs: [reference_to],
+          ct_uid: this.currentUid,
+          name: this.currentTitle,
+          treeStr: tree.map(({ name }) => name).join(' ➜ '),
+        };
+
+        if (!schema) {
+          this.missingRefs[this.currentUid].push(refErrorObj);
+
+          return false;
+        }
+
+        // NOTE Global field section
+        if (reference_to) {
+          const refExist = find(this.gfSchema, { uid: reference_to });
+
+          if (!refExist) {
+            this.missingRefs[this.currentUid].push(refErrorObj);
+          }
+
+          return refExist;
+        }
+
+        block.schema = this.runFixOnSchema(tree, block.schema as ContentTypeSchemaType[]);
+
+        if (isEmpty(block.schema)) {
+          this.missingRefs[this.currentUid].push({
+            ...refErrorObj,
+            missingRefs: 'Empty schema found',
+            treeStr: tree.map(({ name }) => name).join(' ➜ '),
+          });
+
+          this.log($t(auditFixMsg.EMPTY_FIX_MSG, { path: tree.map(({ name }) => name).join(' ➜ ') }), 'info');
+
+          return null;
+        }
+
+        return block;
+      })
+      .filter((val) => val) as ModularBlockType[];
+  }
+
+  /**
+   * The function `fixMissingReferences` checks for missing references in a given tree and field, and
+   * attempts to fix them by removing the missing references from the field's `reference_to` array.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure. Each
+   * object in the array should have a "name" property.
+   * @param {ReferenceFieldDataType | JsonRTEFieldDataType} field - The `field` parameter is of type
+   * `ReferenceFieldDataType` or `JsonRTEFieldDataType`.
+   * @returns the `field` object.
+   */
+  fixMissingReferences(tree: Record<string, unknown>[], field: ReferenceFieldDataType | JsonRTEFieldDataType) {
+    let fixStatus;
+    const missingRefs: string[] = [];
+    const { reference_to, data_type, display_name } = field;
+
+    for (const reference of reference_to ?? []) {
+      // NOTE Can skip specific references keys (Ex, system defined keys can be skipped)
+      if (this.config.skipRefs.includes(reference)) continue;
+
+      const refExist = find(this.ctSchema, { uid: reference });
+
+      if (!refExist) {
+        missingRefs.push(reference);
+      }
+    }
+
+    if (this.fix && !isEmpty(missingRefs)) {
+      try {
+        field.reference_to = field.reference_to.filter((ref) => !missingRefs.includes(ref));
+        fixStatus = 'Fixed';
+      } catch (error) {
+        fixStatus = `Not Fixed (${JSON.stringify(error)})`;
+      }
+
+      this.missingRefs[this.currentUid].push({
+        tree,
+        data_type,
+        fixStatus,
+        missingRefs,
+        display_name,
+        ct_uid: this.currentUid,
+        name: this.currentTitle,
+        treeStr: tree.map(({ name }) => name).join(' ➜ '),
+      });
+    }
+
+    return field;
+  }
+
+  /**
+   * The function `fixGroupField` takes in an array of objects and a field, and performs some
+   * operations on the field's schema property.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {GroupFieldDataType} field - The `field` parameter is an object that contains the following
+   * properties:
+   * @returns The function `fixGroupField` returns either `null` or the `field` object.
+   */
+  fixGroupField(tree: Record<string, unknown>[], field: GroupFieldDataType) {
+    const { data_type, display_name } = field;
+    field.schema = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[]);
+
+    if (isEmpty(field.schema)) {
+      this.missingRefs[this.currentUid].push({
+        tree,
+        data_type,
+        display_name,
+        fixStatus: 'Fixed',
+        ct_uid: this.currentUid,
+        name: this.currentTitle,
+        missingRefs: 'Empty schema found',
+        treeStr: tree.map(({ name }) => name).join(' ➜ '),
+      });
+      this.log($t(auditFixMsg.EMPTY_FIX_MSG, { path: tree.map(({ name }) => name).join(' ➜ ') }), 'info');
+
+      return null;
+    }
+
+    return field;
+  }
 }
diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
index 99c3c000dd..7a820cd2c7 100644
--- a/packages/contentstack-audit/src/modules/entries.ts
+++ b/packages/contentstack-audit/src/modules/entries.ts
@@ -1,21 +1,28 @@
 import find from 'lodash/find';
+import { ux } from '@oclif/core';
 import values from 'lodash/values';
 import isEmpty from 'lodash/isEmpty';
 import { join, resolve } from 'path';
-import { existsSync, readFileSync } from 'fs';
 import { FsUtility } from '@contentstack/cli-utilities';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
 
+import auditConfig from '../config';
+import ContentType from './content-types';
+import { $t, auditMsg, commonMsg } from '../messages';
 import {
   LogFn,
   Locale,
   ConfigType,
   EntryStruct,
+  EntryFieldType,
   ModularBlockType,
   ContentTypeStruct,
   CtConstructorParam,
   GroupFieldDataType,
   GlobalFieldDataType,
   JsonRTEFieldDataType,
+  ContentTypeSchemaType,
+  EntryModularBlockType,
   ModularBlocksDataType,
   ModuleConstructorParam,
   ReferenceFieldDataType,
@@ -26,11 +33,10 @@ import {
   EntryModularBlocksDataType,
   EntryReferenceFieldDataType,
 } from '../types';
-import auditConfig from '../config';
-import { $t, auditMsg } from '../messages';
 
 export default class Entries {
   public log: LogFn;
+  private fix: boolean;
   public fileName: string;
   public locales!: Locale[];
   public config: ConfigType;
@@ -39,19 +45,20 @@ export default class Entries {
   public currentTitle!: string;
   public gfSchema: ContentTypeStruct[];
   public ctSchema: ContentTypeStruct[];
+  private entries!: Record<string, EntryStruct>;
   protected missingRefs: Record<string, any> = {};
   public entryMetaData: Record<string, any>[] = [];
-  public moduleName: keyof typeof auditConfig.moduleConfig = 'content-types';
+  public moduleName: keyof typeof auditConfig.moduleConfig = 'entries';
 
-  constructor({ log, config, moduleName, ctSchema, gfSchema }: ModuleConstructorParam & CtConstructorParam) {
+  constructor({ log, fix, config, moduleName, ctSchema, gfSchema }: ModuleConstructorParam & CtConstructorParam) {
     this.log = log;
     this.config = config;
+    this.fix = fix ?? false;
     this.ctSchema = ctSchema;
     this.gfSchema = gfSchema;
+    this.moduleName = moduleName ?? 'entries';
     this.fileName = config.moduleConfig[this.moduleName].fileName;
     this.folderPath = resolve(config.basePath, config.moduleConfig.entries.dirName);
-
-    if (moduleName) this.moduleName = moduleName;
   }
 
   /**
@@ -66,21 +73,40 @@ export default class Entries {
 
     await this.prepareEntryMetaData();
 
+    this.ctSchema = (await new ContentType({
+      fix: true,
+      log: () => {},
+      config: this.config,
+      moduleName: 'content-types',
+      ctSchema: this.ctSchema,
+      gfSchema: this.gfSchema,
+    }).run(true)) as ContentTypeStruct[];
+    this.gfSchema = (await new ContentType({
+      fix: true,
+      log: () => {},
+      config: this.config,
+      moduleName: 'entries',
+      ctSchema: this.ctSchema,
+      gfSchema: this.gfSchema,
+    }).run(true)) as ContentTypeStruct[];
+
     for (const { code } of this.locales) {
       for (const ctSchema of this.ctSchema) {
         const basePath = join(this.folderPath, ctSchema.uid, code);
         const fsUtility = new FsUtility({ basePath, indexFileName: 'index.json' });
         const indexer = fsUtility.indexFileContent;
 
-        for (const _ in indexer) {
+        for (const fileIndex in indexer) {
           const entries = (await fsUtility.readChunkFiles.next()) as Record<string, EntryStruct>;
-          for (const entryUid in entries) {
-            let entry = entries[entryUid];
+          this.entries = entries;
+
+          for (const entryUid in this.entries) {
+            const entry = this.entries[entryUid];
             const { uid, title } = entry;
             this.currentUid = uid;
             this.currentTitle = title;
             this.missingRefs[this.currentUid] = [];
-            await this.lookForReference([{ uid, name: title }], ctSchema, entry);
+            this.lookForReference([{ uid, name: title }], ctSchema, this.entries[entryUid]);
             this.log(
               $t(auditMsg.SCAN_ENTRY_SUCCESS_MSG, {
                 title,
@@ -90,6 +116,10 @@ export default class Entries {
               'info',
             );
           }
+
+          if (this.fix) {
+            await this.writeFixContent(`${basePath}/${indexer[fileIndex]}`, this.entries);
+          }
         }
       }
     }
@@ -104,6 +134,22 @@ export default class Entries {
     return this.missingRefs;
   }
 
+  /**
+   * The function checks if it can write the fix content to a file and if so, it writes the content as
+   * JSON to the specified file path.
+   */
+  async writeFixContent(filePath: string, schema: Record<string, EntryStruct>) {
+    let canWrite = true;
+
+    if (this.fix && !this.config.flags['copy-dir']) {
+      canWrite = this.config.flags.yes || (await ux.confirm(commonMsg.FIX_CONFIRMATION));
+    }
+
+    if (canWrite) {
+      writeFileSync(filePath, JSON.stringify(schema));
+    }
+  }
+
   /**
    * The function `lookForReference` iterates over a given schema and validates different field types
    * such as reference, global field, JSON, modular blocks, and group fields.
@@ -116,54 +162,61 @@ export default class Entries {
    * EntryGroupFieldDataType} entry - The `entry` parameter is an object that represents the data of an
    * entry. It can have different types depending on the `schema` parameter.
    */
-  async lookForReference(
+  lookForReference(
     tree: Record<string, unknown>[],
-    { schema }: ContentTypeStruct | GlobalFieldDataType | ModularBlockType | GroupFieldDataType,
-    entry: EntryStruct | EntryGlobalFieldDataType | EntryModularBlocksDataType | EntryGroupFieldDataType,
-  ): Promise<void> {
-    for (const field of schema ?? []) {
-      const { uid } = field;
-      switch (field.data_type) {
+    field: ContentTypeStruct | GlobalFieldDataType | ModularBlockType | GroupFieldDataType,
+    entry: EntryFieldType,
+  ) {
+    if (this.fix) {
+      entry = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[], entry);
+    }
+
+    for (const child of field.schema ?? []) {
+      const { uid } = child;
+
+      if (!entry?.[uid]) return;
+
+      switch (child.data_type) {
         case 'reference':
           this.missingRefs[this.currentUid].push(
             ...this.validateReferenceField(
-              [...tree, { uid: field.uid, name: field.display_name, field: uid }],
-              field as ReferenceFieldDataType,
+              [...tree, { uid: child.uid, name: child.display_name, field: uid }],
+              child as ReferenceFieldDataType,
               entry[uid] as EntryReferenceFieldDataType[],
             ),
           );
           break;
         case 'global_field':
-          await this.validateGlobalField(
-            [...tree, { uid: field.uid, name: field.display_name, field: uid }],
-            field as GlobalFieldDataType,
+          this.validateGlobalField(
+            [...tree, { uid: child.uid, name: child.display_name, field: uid }],
+            child as GlobalFieldDataType,
             entry[uid] as EntryGlobalFieldDataType,
           );
           break;
         case 'json':
-          if (field.field_metadata.extension) {
+          if (child.field_metadata.extension) {
             // NOTE Custom field type
-          } else if (field.field_metadata.allow_json_rte) {
+          } else if (child.field_metadata.allow_json_rte) {
             // NOTE JSON RTE field type
-            await this.validateJsonRTEFields(
-              [...tree, { uid: field.uid, name: field.display_name, field: uid }],
-              field as JsonRTEFieldDataType,
+            this.validateJsonRTEFields(
+              [...tree, { uid: child.uid, name: child.display_name, field: uid }],
+              child as JsonRTEFieldDataType,
               entry[uid] as EntryJsonRTEFieldDataType,
             );
           }
           break;
         case 'blocks':
-          await this.validateModularBlocksField(
-            [...tree, { uid: field.uid, name: field.display_name, field: uid }],
-            field as ModularBlocksDataType,
+          this.validateModularBlocksField(
+            [...tree, { uid: child.uid, name: child.display_name, field: uid }],
+            child as ModularBlocksDataType,
             entry[uid] as EntryModularBlocksDataType[],
           );
           break;
         case 'group':
-          await this.validateGroupField(
-            [...tree, { uid: field.uid, name: field.display_name, field: uid }],
-            field as GroupFieldDataType,
-            entry[uid] as EntryGroupFieldDataType,
+          this.validateGroupField(
+            [...tree, { uid: field.uid, name: child.display_name, field: uid }],
+            child as GroupFieldDataType,
+            entry[uid] as EntryGroupFieldDataType[],
           );
           break;
       }
@@ -203,13 +256,13 @@ export default class Entries {
    * @param {EntryGlobalFieldDataType} field - The `field` parameter is of type
    * `EntryGlobalFieldDataType`. It represents a single global field entry.
    */
-  async validateGlobalField(
+  validateGlobalField(
     tree: Record<string, unknown>[],
     fieldStructure: GlobalFieldDataType,
     field: EntryGlobalFieldDataType,
-  ): Promise<void> {
+  ) {
     // NOTE Any GlobalField related logic can be added here
-    await this.lookForReference(tree, fieldStructure, field);
+    this.lookForReference(tree, fieldStructure, field);
   }
 
   /**
@@ -224,38 +277,23 @@ export default class Entries {
    * `EntryJsonRTEFieldDataType`, which represents a JSON RTE field in an entry. It contains properties
    * such as `uid`, `attrs`, and `children`.
    */
-  async validateJsonRTEFields(
+  validateJsonRTEFields(
     tree: Record<string, unknown>[],
     fieldStructure: JsonRTEFieldDataType,
     field: EntryJsonRTEFieldDataType,
   ) {
+    // const missingRefIndex = []
     // NOTE Other possible reference logic will be added related to JSON RTE (Ex missing assets, extensions etc.,)
-    for (const child of field?.children ?? []) {
-      const { uid: childrenUid, attrs, children } = child;
-      const { 'entry-uid': entryUid, 'content-type-uid': contentTypeUid } = attrs || {};
-
-      if (entryUid) {
-        const refExist = find(this.entryMetaData, { uid: entryUid });
+    for (const index in field?.children ?? []) {
+      const child = field.children[index];
+      const { children } = child;
 
-        if (!refExist) {
-          tree.push({ field: 'children' }, { field: childrenUid, uid: fieldStructure.uid });
-          this.missingRefs[this.currentUid].push({
-            tree,
-            uid: this.currentUid,
-            name: this.currentTitle,
-            data_type: fieldStructure.data_type,
-            display_name: fieldStructure.display_name,
-            treeStr: tree
-              .map(({ name }) => name)
-              .filter((val) => val)
-              .join(' ➜ '),
-            missingRefs: [{ uid: entryUid, 'content-type-uid': contentTypeUid }],
-          });
-        }
+      if (!this.fix) {
+        this.jsonRefCheck(tree, fieldStructure, child);
       }
 
       if (!isEmpty(children)) {
-        await this.validateJsonRTEFields(tree, fieldStructure, child);
+        this.validateJsonRTEFields(tree, fieldStructure, field.children[index]);
       }
     }
   }
@@ -273,21 +311,24 @@ export default class Entries {
    * @param {EntryModularBlocksDataType[]} field - The `field` parameter is an array of objects of type
    * `EntryModularBlocksDataType`.
    */
-  async validateModularBlocksField(
+  validateModularBlocksField(
     tree: Record<string, unknown>[],
     fieldStructure: ModularBlocksDataType,
     field: EntryModularBlocksDataType[],
-  ): Promise<void> {
-    const { blocks } = fieldStructure;
+  ) {
+    if (!this.fix) {
+      for (const index in field) {
+        this.modularBlockRefCheck(tree, fieldStructure.blocks, field[index], +index);
+      }
+    }
 
-    // NOTE Traverse each and every module and look for reference
-    for (let index = 0; index < blocks.length; index++) {
-      const ctBlock = blocks[index];
-      const entryBlock = field[index];
-      const { uid } = ctBlock;
+    for (const block of fieldStructure.blocks) {
+      const { uid, title } = block;
 
-      if (entryBlock?.[uid]) {
-        await this.lookForReference([...tree, { field: uid }], ctBlock, entryBlock[uid] as EntryModularBlocksDataType);
+      for (const eBlock of field) {
+        if (eBlock[uid]) {
+          this.lookForReference([...tree, { uid, name: title }], block, eBlock[uid] as EntryModularBlocksDataType);
+        }
       }
     }
   }
@@ -301,13 +342,23 @@ export default class Entries {
    * @param {EntryGroupFieldDataType} field - The `field` parameter is of type
    * `EntryGroupFieldDataType` and represents a single group field entry.
    */
-  async validateGroupField(
+  validateGroupField(
     tree: Record<string, unknown>[],
     fieldStructure: GroupFieldDataType,
-    field: EntryGroupFieldDataType,
-  ): Promise<void> {
+    field: EntryGroupFieldDataType | EntryGroupFieldDataType[],
+  ) {
     // NOTE Any Group Field related logic can be added here (Ex data serialization or picking any metadata for report etc.,)
-    await this.lookForReference(tree, fieldStructure, field);
+    if (Array.isArray(field)) {
+      field.forEach((eGroup) => {
+        this.lookForReference(
+          [...tree, { uid: fieldStructure.uid, display_name: fieldStructure.display_name }],
+          fieldStructure,
+          eGroup,
+        );
+      });
+    } else {
+      this.lookForReference(tree, fieldStructure, field);
+    }
   }
 
   /**
@@ -330,10 +381,13 @@ export default class Entries {
     fieldStructure: ReferenceFieldDataType,
     field: EntryReferenceFieldDataType[],
   ): EntryRefErrorReturnType[] {
-    const missingRefs = [];
-    const { data_type, display_name } = fieldStructure;
+    if (this.fix) return [];
+
+    const missingRefs: Record<string, any>[] = [];
+    const { uid: data_type, display_name } = fieldStructure;
 
-    for (const reference of field ?? []) {
+    for (const index in field ?? []) {
+      const reference = field[index];
       const { uid } = reference;
       // NOTE Can skip specific references keys (Ex, system defined keys can be skipped)
       // if (this.config.skipRefs.includes(reference)) continue;
@@ -341,7 +395,7 @@ export default class Entries {
       const refExist = find(this.entryMetaData, { uid });
 
       if (!refExist) {
-        missingRefs.push(reference as Record<string, unknown>);
+        missingRefs.push(reference);
       }
     }
 
@@ -363,6 +417,355 @@ export default class Entries {
       : [];
   }
 
+  /**
+   * The function `runFixOnSchema` takes in a tree, schema, and entry, and applies fixes to the entry
+   * based on the schema.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing the tree structure of
+   * the schema. Each object has the following properties:
+   * @param {ContentTypeSchemaType[]} schema - The `schema` parameter is an array of objects
+   * representing the content type schema. Each object in the array contains information about a
+   * specific field in the schema, such as its unique identifier (`uid`) and data type (`data_type`).
+   * @param {EntryFieldType} entry - The `entry` parameter is of type `EntryFieldType`, which
+   * represents the data of an entry. It is an object that contains fields as key-value pairs, where
+   * the key is the field UID (unique identifier) and the value is the field data.
+   * @returns the updated `entry` object after applying fixes to the fields based on the provided
+   * `schema`.
+   */
+  runFixOnSchema(tree: Record<string, unknown>[], schema: ContentTypeSchemaType[], entry: EntryFieldType) {
+    // NOTE Global field Fix
+    schema.forEach((field) => {
+      const { uid, data_type } = field;
+
+      switch (data_type) {
+        case 'global_field':
+          entry[uid] = this.fixGlobalFieldReferences(
+            [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
+            field as GlobalFieldDataType,
+            entry[uid] as EntryGlobalFieldDataType,
+          ) as EntryGlobalFieldDataType;
+          break;
+        case 'json':
+        case 'reference':
+          if (data_type === 'json') {
+            if (field.field_metadata.extension) {
+              // NOTE Custom field type
+              return field;
+            } else if (field.field_metadata.allow_json_rte) {
+              return this.fixJsonRteMissingReferences(
+                [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
+                field as JsonRTEFieldDataType,
+                entry[uid] as EntryJsonRTEFieldDataType,
+              );
+            }
+          }
+
+          // NOTE Reference field
+          entry[uid] = this.fixMissingReferences(
+            [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
+            field as ReferenceFieldDataType,
+            entry[uid] as EntryReferenceFieldDataType[],
+          ) as EntryReferenceFieldDataType[];
+          break;
+        case 'blocks':
+          entry[uid] = this.fixModularBlocksReferences(
+            [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
+            (field as ModularBlocksDataType).blocks,
+            entry[uid] as EntryModularBlocksDataType[],
+          );
+          break;
+        case 'group':
+          entry[uid] = this.fixGroupField(
+            [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
+            field as GroupFieldDataType,
+            entry[uid] as EntryGroupFieldDataType[],
+          ) as EntryGroupFieldDataType;
+          break;
+      }
+    });
+
+    return entry;
+  }
+
+  /**
+   * The function `fixGlobalFieldReferences` adds a new entry to a tree data structure and runs a fix
+   * on the schema.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing the tree structure.
+   * @param {GlobalFieldDataType} field - The `field` parameter is of type `GlobalFieldDataType` and
+   * represents a global field object. It contains properties such as `uid` and `display_name`.
+   * @param {EntryGlobalFieldDataType} entry - The `entry` parameter is of type
+   * `EntryGlobalFieldDataType` and represents the global field entry that needs to be fixed.
+   * @returns the result of calling the `runFixOnSchema` method with the updated `tree` array,
+   * `field.schema`, and `entry` as arguments.
+   */
+  fixGlobalFieldReferences(
+    tree: Record<string, unknown>[],
+    field: GlobalFieldDataType,
+    entry: EntryGlobalFieldDataType,
+  ) {
+    return this.runFixOnSchema([...tree, { uid: field.uid, display_name: field.display_name }], field.schema, entry);
+  }
+
+  /**
+   * The function `fixModularBlocksReferences` takes in a tree, a list of blocks, and an entry, and
+   * performs various operations to fix references within the entry.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing the tree structure of
+   * the modular blocks.
+   * @param {ModularBlockType[]} blocks - An array of objects representing modular blocks. Each object
+   * has properties like `uid` (unique identifier) and `title` (display name).
+   * @param {EntryModularBlocksDataType[]} entry - An array of objects representing the modular blocks
+   * data in an entry. Each object in the array represents a modular block and contains its unique
+   * identifier (uid) and other properties.
+   * @returns the updated `entry` array after performing some modifications.
+   */
+  fixModularBlocksReferences(
+    tree: Record<string, unknown>[],
+    blocks: ModularBlockType[],
+    entry: EntryModularBlocksDataType[],
+  ) {
+    entry = entry
+      .map((block, index) => this.modularBlockRefCheck(tree, blocks, block, index))
+      .filter((val) => !isEmpty(val));
+
+    blocks.forEach((block) => {
+      entry = entry
+        .map((eBlock) => {
+          if (!isEmpty(block.schema)) {
+            if (eBlock[block.uid]) {
+              eBlock[block.uid] = this.runFixOnSchema(
+                [...tree, { uid: block.uid, display_name: block.title }],
+                block.schema as ContentTypeSchemaType[],
+                eBlock[block.uid] as EntryFieldType,
+              ) as EntryModularBlockType;
+            }
+          }
+
+          return eBlock;
+        })
+        .filter((val) => !isEmpty(val)) as EntryModularBlocksDataType[];
+    });
+
+    return entry;
+  }
+
+  /**
+   * The function `fixGroupField` takes in a tree, a field, and an entry, and if the field has a
+   * schema, it runs a fix on the schema and returns the updated entry, otherwise it returns the
+   * original entry.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing the tree structure.
+   * @param {GroupFieldDataType} field - The `field` parameter is of type `GroupFieldDataType` and
+   * represents a group field object. It contains properties such as `uid` (unique identifier) and
+   * `display_name` (name of the field).
+   * @param {EntryGroupFieldDataType} entry - The `entry` parameter is of type
+   * `EntryGroupFieldDataType`.
+   * @returns If the `field.schema` is not empty, the function will return the result of calling
+   * `this.runFixOnSchema` with the updated `tree`, `field.schema`, and `entry` as arguments.
+   * Otherwise, it will return the `entry` as is.
+   */
+  fixGroupField(
+    tree: Record<string, unknown>[],
+    field: GroupFieldDataType,
+    entry: EntryGroupFieldDataType | EntryGroupFieldDataType[],
+  ) {
+    if (!isEmpty(field.schema)) {
+      if (Array.isArray(entry)) {
+        entry = entry.map((eGroup) => {
+          return this.runFixOnSchema(
+            [...tree, { uid: field.uid, display_name: field.display_name }],
+            field.schema as ContentTypeSchemaType[],
+            eGroup,
+          );
+        }) as EntryGroupFieldDataType[];
+      } else {
+        entry = this.runFixOnSchema(
+          [...tree, { uid: field.uid, display_name: field.display_name }],
+          field.schema as ContentTypeSchemaType[],
+          entry,
+        ) as EntryGroupFieldDataType;
+      }
+    }
+
+    return entry;
+  }
+
+  /**
+   * The function fixes missing references in a JSON tree structure.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure. Each
+   * object in the array has a string key and an unknown value.
+   * @param {ReferenceFieldDataType | JsonRTEFieldDataType} field - The `field` parameter can be of
+   * type `ReferenceFieldDataType` or `JsonRTEFieldDataType`.
+   * @param {EntryJsonRTEFieldDataType} entry - The `entry` parameter is of type
+   * `EntryJsonRTEFieldDataType`, which represents an entry in a JSON Rich Text Editor (JsonRTE) field.
+   * @returns the updated `entry` object with fixed missing references in the `children` property.
+   */
+  fixJsonRteMissingReferences(
+    tree: Record<string, unknown>[],
+    field: ReferenceFieldDataType | JsonRTEFieldDataType,
+    entry: EntryJsonRTEFieldDataType | EntryJsonRTEFieldDataType[],
+  ) {
+    if (Array.isArray(entry)) {
+      entry = entry.map((child: any, index) => {
+        return this.fixJsonRteMissingReferences(
+          [...tree, { index, type: (child as any)?.type, uid: child?.uid }],
+          field,
+          child,
+        );
+      }) as EntryJsonRTEFieldDataType[];
+    } else {
+      entry.children = entry.children
+        .map((child) => {
+          const refExist = this.jsonRefCheck(tree, field, child);
+
+          if (!refExist) return null;
+
+          if (isEmpty(child.children)) {
+            child = this.fixJsonRteMissingReferences(tree, field, child) as EntryJsonRTEFieldDataType;
+          }
+
+          return child;
+        })
+        .filter((val) => val) as EntryJsonRTEFieldDataType[];
+    }
+
+    return entry;
+  }
+
+  /**
+   * The `fixMissingReferences` function checks for missing references in an entry and adds them to a
+   * list if they are not found.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure. Each
+   * object in the array should have a "name" property and an optional "index" property.
+   * @param {ReferenceFieldDataType | JsonRTEFieldDataType} field - The `field` parameter is of type
+   * `ReferenceFieldDataType` or `JsonRTEFieldDataType`.
+   * @param {EntryReferenceFieldDataType[]} entry - The `entry` parameter is an array of objects that
+   * represent references to other entries. Each object in the array has the following properties:
+   * @returns the `entry` variable.
+   */
+  fixMissingReferences(
+    tree: Record<string, unknown>[],
+    field: ReferenceFieldDataType | JsonRTEFieldDataType,
+    entry: EntryReferenceFieldDataType[],
+  ) {
+    const missingRefs: Record<string, any>[] = [];
+    entry = entry
+      .map((reference) => {
+        const { uid } = reference;
+        const refExist = find(this.entryMetaData, { uid });
+
+        if (!refExist) {
+          missingRefs.push(reference);
+          return null;
+        }
+
+        return reference;
+      })
+      .filter((val) => val) as EntryReferenceFieldDataType[];
+
+    if (!isEmpty(missingRefs)) {
+      this.missingRefs[this.currentUid].push({
+        tree,
+        fixStatus: 'Fixed',
+        uid: this.currentUid,
+        name: this.currentTitle,
+        data_type: field.data_type,
+        display_name: field.display_name,
+        treeStr: tree
+          .map(({ name, index }) => (index || index === 0 ? `[${index}].${name}` : name))
+          .filter((val) => val)
+          .join(' ➜ '),
+        missingRefs,
+      });
+    }
+
+    return entry;
+  }
+
+  /**
+   * The function `modularBlockRefCheck` checks for invalid keys in an entry block and returns the
+   * updated entry block.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing the tree structure of
+   * the blocks.
+   * @param {ModularBlockType[]} blocks - The `blocks` parameter is an array of `ModularBlockType`
+   * objects.
+   * @param {EntryModularBlocksDataType} entryBlock - The `entryBlock` parameter is an object that
+   * represents a modular block entry. It contains key-value pairs where the keys are the UIDs of the
+   * modular blocks and the values are the data associated with each modular block.
+   * @param {Number} index - The `index` parameter is a number that represents the index of the current
+   * block in the `tree` array.
+   * @returns the `entryBlock` object.
+   */
+  modularBlockRefCheck(
+    tree: Record<string, unknown>[],
+    blocks: ModularBlockType[],
+    entryBlock: EntryModularBlocksDataType,
+    index: Number,
+  ) {
+    const validBlockUid = blocks.map((block) => block.uid);
+    const invalidKeys = Object.keys(entryBlock).filter((key) => !validBlockUid.includes(key));
+
+    invalidKeys.forEach((key) => {
+      if (this.fix) {
+        delete entryBlock[key];
+      }
+
+      this.missingRefs[this.currentUid].push({
+        uid: this.currentUid,
+        name: this.currentTitle,
+        data_type: key,
+        display_name: key,
+        fixStatus: this.fix ? 'Fixed' : undefined,
+        tree: [...tree, { index, uid: key, name: key }],
+        treeStr: [...tree, { index, uid: key, name: key }]
+          .map(({ name, index }) => (index || index === 0 ? `[${index}].${name}` : name))
+          .filter((val) => val)
+          .join(' ➜ '),
+        missingRefs: [key],
+      });
+    });
+
+    return entryBlock;
+  }
+
+  /**
+   * The `jsonRefCheck` function checks if a reference exists in a JSON tree and adds missing
+   * references to a list if they are not found.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing the tree structure.
+   * @param {JsonRTEFieldDataType} schema - The `schema` parameter is of type `JsonRTEFieldDataType`
+   * and represents the schema of a JSON field. It contains properties such as `uid`, `data_type`, and
+   * `display_name`.
+   * @param {EntryJsonRTEFieldDataType} child - The `child` parameter is an object that represents a
+   * child entry in a JSON tree. It has the following properties:
+   * @returns The function `jsonRefCheck` returns either `null` or `true`.
+   */
+  jsonRefCheck(tree: Record<string, unknown>[], schema: JsonRTEFieldDataType, child: EntryJsonRTEFieldDataType) {
+    const { uid: childrenUid } = child;
+    const { 'entry-uid': entryUid, 'content-type-uid': contentTypeUid } = child.attrs || {};
+
+    if (entryUid) {
+      const refExist = find(this.entryMetaData, { uid: entryUid });
+
+      if (!refExist) {
+        tree.push({ field: 'children' }, { field: childrenUid, uid: schema.uid });
+        this.missingRefs[this.currentUid].push({
+          tree,
+          uid: this.currentUid,
+          name: this.currentTitle,
+          data_type: schema.data_type,
+          display_name: schema.display_name,
+          fixStatus: this.fix ? 'Fixed' : undefined,
+          treeStr: tree
+            .map(({ name }) => name)
+            .filter((val) => val)
+            .join(' ➜ '),
+          missingRefs: [{ uid: entryUid, 'content-type-uid': contentTypeUid }],
+        });
+
+        return null;
+      }
+    }
+
+    return true;
+  }
+
   /**
    * The function prepares entry metadata by reading and processing files from different locales and
    * schemas.
diff --git a/packages/contentstack-audit/src/types/content-types.ts b/packages/contentstack-audit/src/types/content-types.ts
index 12ce2eedf0..187b71188f 100644
--- a/packages/contentstack-audit/src/types/content-types.ts
+++ b/packages/contentstack-audit/src/types/content-types.ts
@@ -1,22 +1,24 @@
 import config from '../config';
 import { ConfigType, LogFn } from './utils';
 
+type ContentTypeSchemaType =
+  | ReferenceFieldDataType
+  | GlobalFieldDataType
+  | CustomFieldDataType
+  | JsonRTEFieldDataType
+  | GroupFieldDataType
+  | ModularBlocksDataType;
+
 type ContentTypeStruct = {
   uid: string;
   title: string;
   description: string;
-  schema?: (
-    | ReferenceFieldDataType
-    | GlobalFieldDataType
-    | CustomFieldDataType
-    | JsonRTEFieldDataType
-    | GroupFieldDataType
-    | ModularBlocksDataType
-  )[];
+  schema?: ContentTypeSchemaType[];
 };
 
 type ModuleConstructorParam = {
   log: LogFn;
+  fix?: boolean
   config: ConfigType;
   moduleName?: keyof typeof config.moduleConfig;
 };
@@ -42,6 +44,7 @@ type RefErrorReturnType = {
   ct_uid: string;
   treeStr: string;
   data_type: string;
+  fixStatus?: string
   missingRefs: string[];
   display_name: string;
   tree: Record<string, unknown>[];
@@ -54,12 +57,15 @@ type ReferenceFieldDataType = CommonDataTypeStruct & {
 
 // NOTE Type 2
 type GlobalFieldDataType = CommonDataTypeStruct & {
-  reference_to: string;
+  reference_to?: string;
   schema: GlobalFieldSchemaTypes[];
 };
 
 // NOTE Type 3
-type CustomFieldDataType = CommonDataTypeStruct & {};
+type CustomFieldDataType = CommonDataTypeStruct & {
+  reference_to: string[];
+  extension_uid: string;
+};
 
 // NOTE Type 4
 type JsonRTEFieldDataType = CommonDataTypeStruct & {
@@ -75,6 +81,7 @@ type GroupFieldDataType = CommonDataTypeStruct & {
 type ModularBlockType = {
   uid: string;
   title: string;
+  reference_to?: string;
   schema: (
     | JsonRTEFieldDataType
     | ModularBlocksDataType
@@ -100,7 +107,7 @@ enum OutputColumn {
   'Field name' = 'display_name',
   'Field type' = 'data_type',
   'Missing references' = 'missingRefs',
-  Path = 'treeStr',
+  Path = 'treeStr'
 }
 
 export {
@@ -117,4 +124,5 @@ export {
   ModularBlocksSchemaTypes,
   ModularBlockType,
   OutputColumn,
+  ContentTypeSchemaType,
 };
diff --git a/packages/contentstack-audit/src/types/entries.ts b/packages/contentstack-audit/src/types/entries.ts
index 0038e9acf7..7e3f7010a5 100644
--- a/packages/contentstack-audit/src/types/entries.ts
+++ b/packages/contentstack-audit/src/types/entries.ts
@@ -41,8 +41,10 @@ type EntryJsonRTEFieldDataType = {
 };
 
 // NOTE Type 5
+type GroupFieldType = EntryReferenceFieldDataType[] | EntryGlobalFieldDataType | EntryJsonRTEFieldDataType;
+
 type EntryGroupFieldDataType = {
-  [key: string]: EntryReferenceFieldDataType[] | EntryGlobalFieldDataType | EntryJsonRTEFieldDataType;
+  [key: string]: GroupFieldType;
 };
 
 // NOTE Type 6
@@ -63,14 +65,18 @@ type EntryRefErrorReturnType = {
   uid: string;
   treeStr: string;
   data_type: string;
-  missingRefs: string[] | Record<string, unknown>[];
+  fixStatus?: string;
   display_name: string;
   tree: Record<string, unknown>[];
+  missingRefs: string[] | Record<string, unknown>[];
 };
 
+type EntryFieldType = EntryStruct | EntryGlobalFieldDataType | EntryModularBlocksDataType | EntryGroupFieldDataType;
+
 export {
   Locale,
   EntryStruct,
+  EntryFieldType,
   EntryGlobalFieldDataType,
   EntryCustomFieldDataType,
   EntryJsonRTEFieldDataType,
@@ -78,4 +84,6 @@ export {
   EntryModularBlocksDataType,
   EntryReferenceFieldDataType,
   EntryRefErrorReturnType,
+  GroupFieldType,
+  EntryModularBlockType,
 };
diff --git a/packages/contentstack-auth/README.md b/packages/contentstack-auth/README.md
index cce420aebf..1a65450ec5 100644
--- a/packages/contentstack-auth/README.md
+++ b/packages/contentstack-auth/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.3.14 darwin-x64 node-v20.8.0
+@contentstack/cli-auth/1.3.15 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json
index 9562caa8d1..6b5460325f 100644
--- a/packages/contentstack-auth/package.json
+++ b/packages/contentstack-auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-utilities": "~1.5.4",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack-auth/src/base-command.ts b/packages/contentstack-auth/src/base-command.ts
index b621c6b85a..76188417bb 100644
--- a/packages/contentstack-auth/src/base-command.ts
+++ b/packages/contentstack-auth/src/base-command.ts
@@ -9,8 +9,6 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
   protected args!: Args<T>;
   protected flags!: Flags<T>;
 
-  // NOTE define flags that can be inherited by any command that extends BaseCommand
-  static baseFlags: FlagInput = {};
 
   /**
    * The `init` function initializes the command by parsing arguments and flags, registering search
@@ -18,15 +16,6 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    */
   public async init(): Promise<void> {
     await super.init();
-    const { args, flags } = await this.parse({
-      flags: this.ctor.flags,
-      baseFlags: (super.ctor as typeof BaseCommand).baseFlags,
-      args: this.ctor.args,
-      strict: this.ctor.strict,
-    });
-    this.flags = flags as Flags<T>;
-    this.args = args as Args<T>;
-
     // Init logger
     this.logger = new LoggerService(process.cwd(), 'cli-log');
   }
diff --git a/packages/contentstack-bootstrap/README.md b/packages/contentstack-bootstrap/README.md
index 33dfd0410c..dff552cae8 100644
--- a/packages/contentstack-bootstrap/README.md
+++ b/packages/contentstack-bootstrap/README.md
@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/1.5.1 darwin-x64 node-v20.8.0
+@contentstack/cli-cm-bootstrap/1.6.0 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
index 2400d43e29..e8914a7b3e 100644
--- a/packages/contentstack-bootstrap/package.json
+++ b/packages/contentstack-bootstrap/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -17,9 +17,9 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~1.5.0",
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-cm-seed": "~1.6.0",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.1.13"
@@ -73,4 +73,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}
\ No newline at end of file
diff --git a/packages/contentstack-branches/README.md b/packages/contentstack-branches/README.md
index 7210b1e421..023492364b 100755
--- a/packages/contentstack-branches/README.md
+++ b/packages/contentstack-branches/README.md
@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.14 darwin-x64 node-v20.8.0
+@contentstack/cli-cm-branches/1.0.15 darwin-arm64 node-v20.3.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
index 39f9016576..817065a5f2 100644
--- a/packages/contentstack-branches/package.json
+++ b/packages/contentstack-branches/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
diff --git a/packages/contentstack-branches/src/utils/entry-create-update-script.ts b/packages/contentstack-branches/src/utils/entry-create-update-script.ts
index 8c23dc24f3..c3661024e1 100644
--- a/packages/contentstack-branches/src/utils/entry-create-update-script.ts
+++ b/packages/contentstack-branches/src/utils/entry-create-update-script.ts
@@ -463,8 +463,10 @@ export function entryCreateUpdateScript(contentType) {
           const references = await findReference(contentType.schema, '', flag);
   
           async function updateEntry(entry, entryDetails) {
-            Object.assign(entry, { ...entryDetails });
-            await entry.update();
+            if (entry) {
+              Object.assign(entry, { ...entryDetails });
+              await entry.update();
+            }
           }
 
           async function updateReferences(entryDetails, baseEntry, references) {
diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md
index ee55036205..203ca12d63 100644
--- a/packages/contentstack-bulk-publish/README.md
+++ b/packages/contentstack-bulk-publish/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bulk-publish/1.3.12 darwin-x64 node-v20.8.0
+@contentstack/cli-cm-bulk-publish/1.3.13 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json
index 405651fe63..cd9dd6a120 100644
--- a/packages/contentstack-bulk-publish/package.json
+++ b/packages/contentstack-bulk-publish/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-bulk-publish",
   "description": "Contentstack CLI plugin for bulk publish actions",
-  "version": "1.3.12",
+  "version": "1.3.13",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
     "dotenv": "^16.1.4",
diff --git a/packages/contentstack-bulk-publish/src/producer/publish-assets.js b/packages/contentstack-bulk-publish/src/producer/publish-assets.js
index 698855e067..1846b13aff 100644
--- a/packages/contentstack-bulk-publish/src/producer/publish-assets.js
+++ b/packages/contentstack-bulk-publish/src/producer/publish-assets.js
@@ -51,7 +51,7 @@ async function getAssets(stack, folder, bulkPublish, environments, locale, apiVe
                   environments: environments,
                   locale,
                   stack: stack,
-                  apiVersion
+                  apiVersion,
                 });
                 bulkPublishSet = [];
               }
@@ -63,7 +63,7 @@ async function getAssets(stack, folder, bulkPublish, environments, locale, apiVe
                   environments: environments,
                   locale,
                   stack: stack,
-                  apiVersion
+                  apiVersion,
                 });
                 bulkPublishSet = [];
               }
@@ -83,6 +83,8 @@ async function getAssets(stack, folder, bulkPublish, environments, locale, apiVe
           }
           await getAssets(stack, folder, bulkPublish, environments, locale, apiVersion, skip);
           return resolve();
+        } else {
+          resolve();
         }
       })
       .catch((error) => {
diff --git a/packages/contentstack-clone/README.md b/packages/contentstack-clone/README.md
index 279610b9b9..648300f4db 100644
--- a/packages/contentstack-clone/README.md
+++ b/packages/contentstack-clone/README.md
@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-clone/1.5.1 darwin-x64 node-v20.8.0
+@contentstack/cli-cm-clone/1.6.0 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
index 35e9ccd376..d4b345e29f 100644
--- a/packages/contentstack-clone/package.json
+++ b/packages/contentstack-clone/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@contentstack/cli-cm-export": "~1.9.0",
-    "@contentstack/cli-cm-import": "~1.9.0",
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-cm-import": "~1.10.0",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "@colors/colors": "^1.5.0",
     "async": "^3.2.4",
     "chalk": "^4.1.0",
@@ -70,4 +70,4 @@
       "cm:stack-clone": "O-CLN"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json
index ff4db683ca..e5223d5e02 100644
--- a/packages/contentstack-command/package.json
+++ b/packages/contentstack-command/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-command",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "author": "Contentstack",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,7 +17,7 @@
     "format": "eslint src/**/*.ts --fix"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-utilities": "~1.5.4",
     "contentstack": "^3.10.1"
   },
   "devDependencies": {
diff --git a/packages/contentstack-config/README.md b/packages/contentstack-config/README.md
index 5315c64312..f47f435180 100644
--- a/packages/contentstack-config/README.md
+++ b/packages/contentstack-config/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-config/1.4.12 darwin-x64 node-v20.8.0
+@contentstack/cli-config/1.4.13 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
index f5a8234b1a..2873c003f7 100644
--- a/packages/contentstack-config/package.json
+++ b/packages/contentstack-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "author": "Contentstack",
   "scripts": {
     "build": "npm run clean && npm run compile",
@@ -21,8 +21,8 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "mkdirp": "^1.0.4",
diff --git a/packages/contentstack-config/src/base-command.ts b/packages/contentstack-config/src/base-command.ts
index 5e123e111e..a1100c2669 100644
--- a/packages/contentstack-config/src/base-command.ts
+++ b/packages/contentstack-config/src/base-command.ts
@@ -9,8 +9,6 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
   protected args!: Args<T>;
   protected flags!: Flags<T>;
 
-  // NOTE define flags that canin be inherited by any command that extends BaseCommand
-  static baseFlags: FlagInput = {};
   static args: ArgInput<{ [arg: string]: any; }>;
   /**
    * The `init` function initializes the command by parsing arguments and flags, registering search
@@ -18,14 +16,6 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    */
   public async init(): Promise<void> {
     await super.init();
-    const { args, flags } = await this.parse({
-      flags: this.ctor.flags,
-      baseFlags: (super.ctor as typeof BaseCommand).baseFlags,
-      args: this.ctor.args,
-      strict: this.ctor.strict,
-    });
-    this.flags = flags as Flags<T>;
-    this.args = args as Args<T>;
 
     // Init logger
     this.logger = new LoggerService(process.cwd(), 'cli-log');
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
index aaa5e92bbe..0f5c36b25b 100644
--- a/packages/contentstack-export-to-csv/package.json
+++ b/packages/contentstack-export-to-csv/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export-to-csv",
   "description": "Export entities to csv",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "author": "Abhinav Gupta @abhinav-from-contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "chalk": "^4.1.0",
     "fast-csv": "^4.3.6",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack-export/README.md b/packages/contentstack-export/README.md
index 06224ce5f0..c36ef67f18 100755
--- a/packages/contentstack-export/README.md
+++ b/packages/contentstack-export/README.md
@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.9.1 darwin-x64 node-v20.8.0
+@contentstack/cli-cm-export/1.9.2 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
index 51a6192c91..b0c89fbd78 100644
--- a/packages/contentstack-export/package.json
+++ b/packages/contentstack-export/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
@@ -94,8 +94,8 @@
     },
     "shortCommandName": {
       "cm:stacks:export": "EXPRT",
-      "cm:export": "EXPRT"
+      "cm:export": "O-EXPRT"
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
\ No newline at end of file
diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts
index 24eb5cde66..eb6e3a51d9 100644
--- a/packages/contentstack-export/src/commands/cm/stacks/export.ts
+++ b/packages/contentstack-export/src/commands/cm/stacks/export.ts
@@ -110,7 +110,9 @@ export default class ExportCommand extends Command {
       const managementAPIClient: ContentstackClient = await managementSDKClient(exportConfig);
       const moduleExporter = new ModuleExporter(managementAPIClient, exportConfig);
       await moduleExporter.start();
-      writeExportMetaFile(exportConfig);
+      if (!exportConfig.branches?.length) {
+        writeExportMetaFile(exportConfig);
+      }
       log(exportConfig, `The content of the stack ${exportConfig.apiKey} has been exported successfully!`, 'success');
       log(exportConfig, `The log has been stored at '${path.join(exportDir, 'logs', 'export')}'`, 'success');
     } catch (error) {
diff --git a/packages/contentstack-export/src/export/module-exporter.ts b/packages/contentstack-export/src/export/module-exporter.ts
index dacd48c639..750da46c07 100644
--- a/packages/contentstack-export/src/export/module-exporter.ts
+++ b/packages/contentstack-export/src/export/module-exporter.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { ContentstackClient } from '@contentstack/cli-utilities';
-import { setupBranches, setupExportDir, log, formatError } from '../utils';
+import { setupBranches, setupExportDir, log, formatError, writeExportMetaFile } from '../utils';
 import startModuleExport from './modules';
 import startJSModuleExport from './modules-js';
 import { ExportConfig, Modules } from '../types';
@@ -37,6 +37,8 @@ class ModuleExporter {
       try {
         this.exportConfig.branchName = branch.uid;
         this.exportConfig.branchDir = path.join(this.exportConfig.exportDir, branch.uid);
+        log(this.exportConfig, `Exporting content from branch ${branch.uid}`, 'success');
+        writeExportMetaFile(this.exportConfig, this.exportConfig.branchDir);
         await this.export();
         log(this.exportConfig, `The content of branch ${branch.uid} has been exported successfully!`, 'success');
       } catch (error) {
diff --git a/packages/contentstack-export/src/utils/common-helper.ts b/packages/contentstack-export/src/utils/common-helper.ts
index 6d6baaaf8e..c0c45cc058 100644
--- a/packages/contentstack-export/src/utils/common-helper.ts
+++ b/packages/contentstack-export/src/utils/common-helper.ts
@@ -80,10 +80,10 @@ export const executeTask = function (
 };
 
 // Note: we can add more useful details in meta file
-export const writeExportMetaFile = (exportConfig: ExportConfig) => {
+export const writeExportMetaFile = (exportConfig: ExportConfig, metaFilePath?: string) => {
   const exportMeta = {
     contentVersion: exportConfig.contentVersion,
     logsPath: path.join(exportConfig.exportDir, 'logs', 'export'),
   };
-  fsUtil.writeFile(path.join(exportConfig.exportDir, exportConfig.branchName || '', 'export-info.json'), exportMeta);
+  fsUtil.writeFile(path.join(metaFilePath || exportConfig.exportDir, 'export-info.json'), exportMeta);
 };
diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md
index 7d0128bac8..d8d1ef8968 100644
--- a/packages/contentstack-import/README.md
+++ b/packages/contentstack-import/README.md
@@ -2,7 +2,7 @@
 
 It is Contentstack’s CLI plugin to import content in the stack. To learn how to export and import content in Contentstack, refer to the [Migration guide](https://www.contentstack.com/docs/developers/cli/migration/).
 
-[![License](https://img.shields.io/npm/l/@contentstack/cli)](https://github.com/contentstack/cli/blob/main/LICENSE)
+[![License](https://img.shields.io/npm/l/@contentstack/cli)](https://github.com/contentstack/cli/blob/main/LICENSE)it -m 
 
 <!-- toc -->
 * [Usage](#usage)
@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.9.1 darwin-x64 node-v20.8.0
+@contentstack/cli-cm-import/1.10.0 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -81,6 +81,8 @@ FLAGS
   -y, --yes                         [optional] Override marketplace prompts
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
+  --replace-existing                Replaces the existing module in the target stack.
+  --skip-existing                   Skips the module exists warning messages.
 
 DESCRIPTION
   Import content from a stack
@@ -126,6 +128,8 @@ FLAGS
   -y, --yes                         [optional] Override marketplace prompts
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
+  --replace-existing                Replaces the existing module in the target stack.
+  --skip-existing                   Skips the module exists warning messages.
 
 DESCRIPTION
   Import content from a stack
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
index 001d5b5000..e24d4d11a0 100644
--- a/packages/contentstack-import/package.json
+++ b/packages/contentstack-import/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "@contentstack/management": "~1.10.2",
     "@oclif/core": "^2.9.3",
     "big-json": "^3.2.0",
@@ -92,8 +92,8 @@
     },
     "shortCommandName": {
       "cm:stacks:import": "IMPRT",
-      "cm:import": "IMPRT"
+      "cm:import": "O-IMPRT"
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
\ No newline at end of file
diff --git a/packages/contentstack-import/src/commands/cm/stacks/import.ts b/packages/contentstack-import/src/commands/cm/stacks/import.ts
index 48789c95b3..64f2d73e7a 100644
--- a/packages/contentstack-import/src/commands/cm/stacks/import.ts
+++ b/packages/contentstack-import/src/commands/cm/stacks/import.ts
@@ -66,6 +66,7 @@ export default class ImportCommand extends Command {
       parse: printFlagDeprecation(['-A', '--auth-token']),
     }),
     module: flags.string({
+      required: false,
       char: 'm',
       description: '[optional] specific module name',
       parse: printFlagDeprecation(['-m'], ['--module']),
@@ -91,6 +92,16 @@ export default class ImportCommand extends Command {
       required: false,
       description: '[optional] Override marketplace prompts',
     }),
+    'replace-existing': flags.boolean({
+      required: false,
+      description: 'Replaces the existing module in the target stack.',
+      dependsOn: ['module'],
+    }),
+    'skip-existing': flags.boolean({
+      required: false,
+      default: false,
+      description: 'Skips the module exists warning messages.',
+    }),
   };
 
   static aliases: string[] = ['cm:import'];
@@ -113,7 +124,11 @@ export default class ImportCommand extends Command {
       const moduleImporter = new ModuleImporter(managementAPIClient, importConfig);
       await moduleImporter.start();
       log(importConfig, `The content has been imported to the stack ${importConfig.apiKey} successfully!`, 'success');
-      log(importConfig, `The log has been stored at '${path.join(importConfig.backupDir, 'logs', 'import')}'`, 'success');
+      log(
+        importConfig,
+        `The log has been stored at '${path.join(importConfig.backupDir, 'logs', 'import')}'`,
+        'success',
+      );
     } catch (error) {
       log({ data: backupDir } as ImportConfig, `Failed to import stack content - ${formatError(error)}`, 'error');
       log(
diff --git a/packages/contentstack-import/src/config/index.ts b/packages/contentstack-import/src/config/index.ts
index c9003f3622..4f472a5bb6 100644
--- a/packages/contentstack-import/src/config/index.ts
+++ b/packages/contentstack-import/src/config/index.ts
@@ -367,6 +367,7 @@ const config: DefaultConfig = {
     stacks: '/stacks/',
     labels: '/labels/',
   },
+  overwriteSupportedModules: ['extensions', 'global-fields', 'content-types'],
   rateLimit: 5,
   preserveStackVersion: false,
   entriesPublish: true,
diff --git a/packages/contentstack-import/src/import/modules/base-class.ts b/packages/contentstack-import/src/import/modules/base-class.ts
index fa99462ead..6f601a1f21 100644
--- a/packages/contentstack-import/src/import/modules/base-class.ts
+++ b/packages/contentstack-import/src/import/modules/base-class.ts
@@ -32,6 +32,7 @@ export type ApiModuleType =
   | 'publish-assets'
   | 'create-assets-folder'
   | 'create-extensions'
+  | 'update-extensions'
   | 'create-locale'
   | 'update-locale'
   | 'create-gfs'
diff --git a/packages/contentstack-import/src/import/modules/entries.ts b/packages/contentstack-import/src/import/modules/entries.ts
index fa83c02d06..75c77da1c4 100644
--- a/packages/contentstack-import/src/import/modules/entries.ts
+++ b/packages/contentstack-import/src/import/modules/entries.ts
@@ -107,6 +107,15 @@ export default class EntriesImport extends BaseClass {
       for (let entryRequestOption of entryRequestOptions) {
         await this.createEntries(entryRequestOption);
       }
+      if (this.importConfig.replaceExisting && indexOf(this.importConfig.overwriteSupportedModules, 'entries') !== -1) {
+        // Note: Instead of using entryRequestOptions, we can prepare request options for replace, to avoid unnecessary operations
+        for (let entryRequestOption of entryRequestOptions) {
+          await this.replaceEntries(entryRequestOption).catch((error) => {
+            log(this.importConfig, `Error while replacing the existing entries ${formatError(error)}`, 'error');
+          });
+        }
+      }
+
       await fileHelper.writeLargeFile(path.join(this.entriesMapperPath, 'uid-mapping.json'), this.entriesUidMapper); // TBD: manages mapper in one file, should find an alternative
       fsUtil.writeFile(path.join(this.entriesMapperPath, 'failed-entries.json'), this.failedEntries);
 
@@ -200,7 +209,8 @@ export default class EntriesImport extends BaseClass {
    * @returns {ApiOptions} ApiOptions
    */
   serializeUpdateCTs(apiOptions: ApiOptions): ApiOptions {
-    const { apiData: contentType } = apiOptions;
+    const { apiData } = apiOptions;
+    const contentType = cloneDeep(apiData);
     if (contentType.field_rules) {
       delete contentType.field_rules;
     }
@@ -281,12 +291,27 @@ export default class EntriesImport extends BaseClass {
       keepMetadata: false,
       omitKeys: this.entriesConfig.invalidKeys,
     });
+
+    // create file instance for existing entries
+    const existingEntriesFileHelper = new FsUtility({
+      moduleName: 'entries',
+      indexFileName: 'index.json',
+      basePath: path.join(this.entriesMapperPath, cTUid, locale, 'existing'),
+      chunkFileSize: this.entriesConfig.chunkFileSize,
+      keepMetadata: false,
+      omitKeys: this.entriesConfig.invalidKeys,
+    });
+
     const contentType = find(this.cTs, { uid: cTUid });
 
     const onSuccess = ({ response, apiData: entry, additionalInfo }: any) => {
       if (additionalInfo[entry.uid]?.isLocalized) {
         let oldUid = additionalInfo[entry.uid].entryOldUid;
-        log(this.importConfig, `Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
+        log(
+          this.importConfig,
+          `Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`,
+          'info',
+        );
         entry.uid = oldUid;
         entry.entryOldUid = oldUid;
         entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
@@ -306,10 +331,36 @@ export default class EntriesImport extends BaseClass {
         entriesCreateFileHelper.writeIntoFile({ [entry.uid]: entry } as any, { mapKeyVal: true });
       }
     };
-    const onReject = ({ error, apiData: { uid, title } }: any) => {
-      log(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to create`, 'error');
-      log(this.importConfig, formatError(error), 'error');
-      this.failedEntries.push({ content_type: cTUid, locale, entry: { uid, title } });
+    const onReject = ({ error, apiData: entry, additionalInfo }: any) => {
+      const { title, uid } = entry;
+      //Note: write existing entries into files to handler later
+      if (error.errorCode === 119) {
+        if (error?.errors?.title || error?.errors?.uid) {
+          if (
+            this.importConfig.replaceExisting &&
+            indexOf(this.importConfig.overwriteSupportedModules, 'entries') !== -1
+          ) {
+            entry.entryOldUid = uid;
+            entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
+            existingEntriesFileHelper.writeIntoFile({ [uid]: entry } as any, { mapKeyVal: true });
+          }
+          if (!this.importConfig.skipExisting) {
+            log(this.importConfig, `Entry '${title}' already exists`, 'info');
+          }
+        } else {
+          log(
+            this.importConfig,
+            `${title} entry of content type ${cTUid} in locale ${locale} failed to create`,
+            'error',
+          );
+          log(this.importConfig, formatError(error), 'error');
+          this.failedEntries.push({ content_type: cTUid, locale, entry: { uid, title } });
+        }
+      } else {
+        log(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to create`, 'error');
+        log(this.importConfig, formatError(error), 'error');
+        this.failedEntries.push({ content_type: cTUid, locale, entry: { uid, title } });
+      }
     };
 
     for (const index in indexer) {
@@ -335,6 +386,7 @@ export default class EntriesImport extends BaseClass {
           concurrencyLimit: this.importConcurrency,
         }).then(() => {
           entriesCreateFileHelper?.completeFile(true);
+          existingEntriesFileHelper?.completeFile(true);
           log(this.importConfig, `Created entries for content type ${cTUid} in locale ${locale}`, 'success');
         });
       }
@@ -379,7 +431,7 @@ export default class EntriesImport extends BaseClass {
         apiOptions.apiData = entryResponse;
         apiOptions.additionalInfo[entryResponse.uid] = {
           isLocalized: true,
-          entryOldUid: entry.uid
+          entryOldUid: entry.uid,
         };
         return apiOptions;
       }
@@ -397,6 +449,135 @@ export default class EntriesImport extends BaseClass {
     return apiOptions;
   }
 
+  async replaceEntries({ cTUid, locale }: { cTUid: string; locale: string }): Promise<void> {
+    const processName = 'Replace existing Entries';
+    const indexFileName = 'index.json';
+    const basePath = path.join(this.entriesMapperPath, cTUid, locale, 'existing');
+    const fs = new FsUtility({ basePath, indexFileName });
+    const indexer = fs.indexFileContent;
+    const indexerCount = values(indexer).length;
+    if (indexerCount === 0) {
+      return Promise.resolve();
+    }
+
+    // Write updated entries
+    const entriesReplaceFileHelper = new FsUtility({
+      moduleName: 'entries',
+      indexFileName: 'index.json',
+      basePath: path.join(this.entriesMapperPath, cTUid, locale),
+      chunkFileSize: this.entriesConfig.chunkFileSize,
+      keepMetadata: false,
+      useIndexer: true,
+      omitKeys: this.entriesConfig.invalidKeys,
+    });
+    // log(this.importConfig, `Starting to update entries with references for ${cTUid} in locale ${locale}`, 'info');
+
+    const contentType = find(this.cTs, { uid: cTUid });
+
+    const onSuccess = ({ response, apiData: entry, additionalInfo }: any) => {
+      log(this.importConfig, `Replaced entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
+      this.entriesUidMapper[entry.uid] = response.uid;
+      entriesReplaceFileHelper.writeIntoFile({ [entry.uid]: entry } as any, { mapKeyVal: true });
+    };
+    const onReject = ({ error, apiData: { uid, title } }: any) => {
+      log(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to replace`, 'error');
+      log(this.importConfig, formatError(error), 'error');
+      this.failedEntries.push({
+        content_type: cTUid,
+        locale,
+        entry: { uid: this.entriesUidMapper[uid], title },
+        entryId: uid,
+      });
+    };
+
+    for (const index in indexer) {
+      const chunk = await fs.readChunkFiles.next().catch((error) => {
+        log(this.importConfig, formatError(error), 'error');
+      });
+
+      if (chunk) {
+        let apiContent = values(chunk as Record<string, any>[]);
+        await this.makeConcurrentCall(
+          {
+            apiContent,
+            processName,
+            indexerCount,
+            currentIndexer: +index,
+            apiParams: {
+              reject: onReject,
+              resolve: onSuccess,
+              entity: 'update-entries',
+              includeParamOnCompletion: true,
+              additionalInfo: { contentType, locale, cTUid },
+            },
+            concurrencyLimit: this.importConcurrency,
+          },
+          this.replaceEntriesHandler.bind(this),
+        ).then(() => {
+          entriesReplaceFileHelper?.completeFile(true);
+          log(this.importConfig, `Replaced entries for content type ${cTUid} in locale ${locale}`, 'success');
+        });
+      }
+    }
+  }
+
+  async replaceEntriesHandler({
+    apiParams,
+    element: entry,
+    isLastRequest,
+  }: {
+    apiParams: ApiOptions;
+    element: Record<string, string>;
+    isLastRequest: boolean;
+  }) {
+    const { additionalInfo: { cTUid, locale } = {} } = apiParams;
+    return new Promise(async (resolve, reject) => {
+      const { items: [entryInStack] = [] }: any =
+        (await this.stack
+          .contentType(cTUid)
+          .entry()
+          .query({ query: { title: entry.title, locale } })
+          .findOne()
+          .catch((error: Error) => {
+            apiParams.reject({
+              error,
+              apiData: entry,
+            });
+            reject(true);
+          })) || {};
+      if (entryInStack) {
+        const entryPayload = this.stack.contentType(cTUid).entry(entryInStack.uid);
+        Object.assign(entryPayload, entryInStack, cloneDeep(entry), {
+          uid: entryInStack.uid,
+          urlPath: entryInStack.urlPath,
+          stackHeaders: entryInStack.stackHeaders,
+          _version: entryInStack._version,
+        });
+        return entryPayload
+          .update({ locale })
+          .then((response: any) => {
+            apiParams.resolve({
+              response,
+              apiData: entry,
+            });
+            resolve(true);
+          })
+          .catch((error: Error) => {
+            apiParams.reject({
+              error,
+              apiData: entry,
+            });
+            reject(true);
+          });
+      } else {
+        apiParams.reject({
+          error: new Error(`Entry with title ${entry.title} not found in the stack`),
+          apiData: entry,
+        });
+        reject(true);
+      }
+    });
+  }
   populateEntryUpdatePayload(): { cTUid: string; locale: string }[] {
     const requestOptions: { cTUid: string; locale: string }[] = [];
     for (let locale of this.locales) {
@@ -544,7 +725,8 @@ export default class EntriesImport extends BaseClass {
    * @returns {ApiOptions} ApiOptions
    */
   serializeUpdateCTsWithRef(apiOptions: ApiOptions): ApiOptions {
-    const { apiData: contentType } = apiOptions;
+    const { apiData } = apiOptions;
+    const contentType = cloneDeep(apiData);
     if (contentType.field_rules) {
       delete contentType.field_rules;
     }
diff --git a/packages/contentstack-import/src/import/modules/extensions.ts b/packages/contentstack-import/src/import/modules/extensions.ts
index adaa33f477..22ce73dbb9 100644
--- a/packages/contentstack-import/src/import/modules/extensions.ts
+++ b/packages/contentstack-import/src/import/modules/extensions.ts
@@ -1,5 +1,6 @@
 import isEmpty from 'lodash/isEmpty';
 import values from 'lodash/values';
+import cloneDeep from 'lodash/cloneDeep';
 import { join } from 'node:path';
 
 import { log, formatError, fsUtil, fileHelper } from '../../utils';
@@ -17,6 +18,7 @@ export default class ImportExtensions extends BaseClass {
   private extUidMapper: Record<string, unknown>;
   private extSuccess: Record<string, unknown>[];
   private extFailed: Record<string, unknown>[];
+  private existingExtensions: Record<string, unknown>[];
 
   constructor({ importConfig, stackAPIClient }: ModuleClassParams) {
     super({ importConfig, stackAPIClient });
@@ -28,6 +30,7 @@ export default class ImportExtensions extends BaseClass {
     this.extFailsPath = join(this.mapperDirPath, 'fails.json');
     this.extFailed = [];
     this.extSuccess = [];
+    this.existingExtensions = [];
     this.extUidMapper = {};
   }
 
@@ -40,7 +43,10 @@ export default class ImportExtensions extends BaseClass {
 
     //Step1 check folder exists or not
     if (fileHelper.fileExistsSync(this.extensionsFolderPath)) {
-      this.extensions = fsUtil.readFile(join(this.extensionsFolderPath, 'extensions.json'), true) as Record<string,unknown>;
+      this.extensions = fsUtil.readFile(join(this.extensionsFolderPath, 'extensions.json'), true) as Record<
+        string,
+        unknown
+      >;
     } else {
       log(this.importConfig, `No such file or directory - '${this.extensionsFolderPath}'`, 'error');
       return;
@@ -53,6 +59,13 @@ export default class ImportExtensions extends BaseClass {
 
     await this.importExtensions();
 
+    // Note: if any extensions present, then update it
+    if (this.importConfig.replaceExisting && this.existingExtensions.length > 0) {
+      await this.replaceExtensions().catch((error: Error) => {
+        log(this.importConfig, `Error while replacing extensions ${formatError(error)}`, 'error');
+      });
+    }
+
     if (this.extSuccess?.length) {
       fsUtil.writeFile(this.extSuccessPath, this.extSuccess);
     }
@@ -80,10 +93,14 @@ export default class ImportExtensions extends BaseClass {
     };
 
     const onReject = ({ error, apiData }: any) => {
-      const err = error?.message ? JSON.parse(error.message) : error;
       const { title } = apiData;
-      if (err?.errors?.title) {
-        log(this.importConfig, `Extension '${title}' already exists`, 'info');
+      if (error?.errors?.title) {
+        if (this.importConfig.replaceExisting) {
+          this.existingExtensions.push(apiData);
+        }
+        if (!this.importConfig.skipExisting) {
+          log(this.importConfig, `Extension '${title}' already exists`, 'info');
+        }
       } else {
         this.extFailed.push(apiData);
         log(this.importConfig, `Extension '${title}' failed to be import ${formatError(error)}`, 'error');
@@ -96,7 +113,6 @@ export default class ImportExtensions extends BaseClass {
         apiContent,
         processName: 'import extensions',
         apiParams: {
-          serializeData: this.serializeExtensions.bind(this),
           reject: onReject.bind(this),
           resolve: onSuccess.bind(this),
           entity: 'create-extensions',
@@ -109,19 +125,88 @@ export default class ImportExtensions extends BaseClass {
     );
   }
 
-  /**
-   * @method serializeExtensions
-   * @param {ApiOptions} apiOptions ApiOptions
-   * @returns {ApiOptions} ApiOptions
-   */
-  serializeExtensions(apiOptions: ApiOptions): ApiOptions {
-    const { apiData: extension } = apiOptions;
-    if (this.extUidMapper.hasOwnProperty(extension.uid)) {
-      log(this.importConfig, `Extension '${extension.title}' already exists. Skipping it to avoid duplicates!`, 'info');
-      apiOptions.entity = undefined;
-    } else {
-      apiOptions.apiData = extension;
-    }
-    return apiOptions;
+  async replaceExtensions(): Promise<any> {
+    const onSuccess = ({ response, apiData: { uid, title } = { uid: null, title: '' } }: any) => {
+      this.extSuccess.push(response);
+      this.extUidMapper[uid] = response.uid;
+      log(this.importConfig, `Extension '${title}' replaced successfully`, 'success');
+      fsUtil.writeFile(this.extUidMapperPath, this.extUidMapper);
+    };
+
+    const onReject = ({ error, apiData }: any) => {
+      this.extFailed.push(apiData);
+      log(this.importConfig, `Extension '${apiData.title}' failed to replace ${formatError(error)}`, 'error');
+      log(this.importConfig, error, 'error');
+    };
+
+    await this.makeConcurrentCall(
+      {
+        apiContent: this.existingExtensions,
+        processName: 'Replace extensions',
+        apiParams: {
+          reject: onReject.bind(this),
+          resolve: onSuccess.bind(this),
+          entity: 'update-extensions',
+          includeParamOnCompletion: true,
+        },
+        concurrencyLimit: this.importConfig.concurrency || this.importConfig.fetchConcurrency || 1,
+      },
+      this.replaceExtensionHandler.bind(this),
+    );
+  }
+
+  async replaceExtensionHandler({
+    apiParams,
+    element: extension,
+    isLastRequest,
+  }: {
+    apiParams: ApiOptions;
+    element: Record<string, string>;
+    isLastRequest: boolean;
+  }) {
+    return new Promise(async (resolve, reject) => {
+      const { items: [extensionsInStack] = [] }: any = await this.stack
+        .extension()
+        .query({ query: { title: extension.title } })
+        .findOne()
+        .catch((error) => {
+          apiParams.reject({
+            error,
+            apiData: extension,
+          });
+          reject(true);
+        });
+      if (extensionsInStack) {
+        const extensionPayload = this.stack.extension(extension.uid);
+        Object.assign(extensionPayload, extensionsInStack, cloneDeep(extension), {
+          uid: extensionsInStack.uid,
+          urlPath: extensionsInStack.urlPath,
+          _version: extensionsInStack._version,
+          stackHeaders: extensionsInStack.stackHeaders,
+        });
+        return extensionPayload
+          .update()
+          .then((response) => {
+            apiParams.resolve({
+              response,
+              apiData: extension,
+            });
+            resolve(true);
+          })
+          .catch((error) => {
+            apiParams.reject({
+              error,
+              apiData: extension,
+            });
+            reject(true);
+          });
+      } else {
+        apiParams.reject({
+          error: new Error(`Extension with title ${extension.title} not found in the stack`),
+          apiData: extension,
+        });
+        reject(true);
+      }
+    });
   }
 }
diff --git a/packages/contentstack-import/src/import/modules/global-fields.ts b/packages/contentstack-import/src/import/modules/global-fields.ts
index 958ada0c17..4cb4789cd1 100644
--- a/packages/contentstack-import/src/import/modules/global-fields.ts
+++ b/packages/contentstack-import/src/import/modules/global-fields.ts
@@ -6,7 +6,7 @@
  */
 
 import * as path from 'path';
-import { values, isEmpty, filter, pick } from 'lodash';
+import { isEmpty, cloneDeep } from 'lodash';
 import { cliux } from '@contentstack/cli-utilities';
 import { GlobalFieldData } from '@contentstack/management/types/stack/globalField';
 import { fsUtil, log, formatError, fileHelper, lookupExtension, removeReferenceFields } from '../../utils';
@@ -30,6 +30,7 @@ export default class ImportGlobalFields extends BaseClass {
   private marketplaceAppMapperPath: string;
   private reqConcurrency: number;
   private installedExtensions: Record<string, unknown>;
+  private existingGFs: Record<string, any>[];
   private gFsConfig: {
     dirName: string;
     fileName: string;
@@ -47,6 +48,7 @@ export default class ImportGlobalFields extends BaseClass {
     this.createdGFs = [];
     this.failedGFs = [];
     this.pendingGFs = [];
+    this.existingGFs = [];
     this.reqConcurrency = this.gFsConfig.writeConcurrency || this.config.writeConcurrency;
     this.gFsMapperPath = path.resolve(this.config.data, 'mapper', 'global_fields');
     this.gFsFolderPath = path.resolve(this.config.data, this.gFsConfig.dirName);
@@ -73,6 +75,13 @@ export default class ImportGlobalFields extends BaseClass {
 
     await this.importGFs();
     fsUtil.writeFile(this.gFsPendingPath, this.pendingGFs);
+
+    if (this.importConfig.replaceExisting && this.existingGFs.length > 0) {
+      await this.replaceGFs().catch((error: Error) => {
+        log(this.importConfig, `Error while replacing global fields ${formatError(error)}`, 'error');
+      });
+    }
+
     log(this.config, 'Global fields import has been completed!', 'info');
   }
 
@@ -83,10 +92,20 @@ export default class ImportGlobalFields extends BaseClass {
       fsUtil.writeFile(this.gFsUidMapperPath, this.gFsUidMapper);
       log(this.config, 'Global field ' + uid + ' created successfully', 'success');
     };
-    const onReject = ({ error, apiData: { uid } = undefined }: any) => {
-      log(this.importConfig, `Global fields '${uid}' failed to import`, 'error');
-      log(this.importConfig, formatError(error), 'error');
-      this.failedGFs.push({ uid });
+    const onReject = ({ error, apiData: globalField = undefined }: any) => {
+      const uid = globalField.uid;
+      if (error?.errors?.title) {
+        if (this.importConfig.replaceExisting) {
+          this.existingGFs.push(globalField);
+        }
+        if (!this.importConfig.skipExisting) {
+          log(this.importConfig, `Global fields '${uid}' already exist`, 'info');
+        }
+      } else {
+        log(this.importConfig, `Global fields '${uid}' failed to import`, 'error');
+        log(this.importConfig, formatError(error), 'error');
+        this.failedGFs.push({ uid });
+      }
     };
 
     return await this.makeConcurrentCall(
@@ -117,7 +136,7 @@ export default class ImportGlobalFields extends BaseClass {
     return new Promise(async (resolve, reject) => {
       lookupExtension(this.config, globalField.schema, this.config.preserveStackVersion, this.installedExtensions);
       let flag = { supressed: false };
-      await removeReferenceFields(globalField.schema, flag, this.stackAPIClient);
+      await removeReferenceFields(globalField.schema, flag, this.stack);
       if (flag.supressed) {
         this.pendingGFs.push(globalField.uid);
       }
@@ -140,4 +159,51 @@ export default class ImportGlobalFields extends BaseClass {
         });
     });
   }
+
+  async replaceGFs(): Promise<any> {
+    const onSuccess = ({ response: globalField, apiData: { uid } = { uid: null } }: any) => {
+      this.createdGFs.push(globalField);
+      this.gFsUidMapper[uid] = globalField;
+      fsUtil.writeFile(this.gFsUidMapperPath, this.gFsUidMapper);
+      log(this.config, 'Global field ' + uid + ' replaced successfully', 'success');
+    };
+
+    const onReject = ({ error, apiData: { uid } }: any) => {
+      log(this.importConfig, `Global fields '${uid}' failed to replace`, 'error');
+      log(this.importConfig, formatError(error), 'error');
+      this.failedGFs.push({ uid });
+    };
+
+    await this.makeConcurrentCall(
+      {
+        apiContent: this.existingGFs,
+        processName: 'Replace global fields',
+        apiParams: {
+          serializeData: this.serializeReplaceGFs.bind(this),
+          reject: onReject.bind(this),
+          resolve: onSuccess.bind(this),
+          entity: 'update-gfs',
+          includeParamOnCompletion: true,
+        },
+        concurrencyLimit: this.importConfig.concurrency || this.importConfig.fetchConcurrency || 1,
+      },
+      undefined,
+      false,
+    );
+  }
+
+  /**
+   * @method serializeUpdateGFs
+   * @param {ApiOptions} apiOptions ApiOptions
+   * @returns {ApiOptions} ApiOptions
+   */
+  serializeReplaceGFs(apiOptions: ApiOptions): ApiOptions {
+    const { apiData: globalField } = apiOptions;
+    const globalFieldPayload = this.stack.globalField(globalField.uid);
+    Object.assign(globalFieldPayload, cloneDeep(globalField), {
+      stackHeaders: globalFieldPayload.stackHeaders,
+    });
+    apiOptions.apiData = globalFieldPayload;
+    return apiOptions;
+  }
 }
diff --git a/packages/contentstack-import/src/import/modules/locales.ts b/packages/contentstack-import/src/import/modules/locales.ts
index 68bf574ae9..5c417d8256 100644
--- a/packages/contentstack-import/src/import/modules/locales.ts
+++ b/packages/contentstack-import/src/import/modules/locales.ts
@@ -137,8 +137,12 @@ export default class ImportLocales extends BaseClass {
       fsUtil.writeFile(this.langUidMapperPath, this.langUidMapper);
     };
     const onReject = ({ error, apiData: { uid, code } = undefined }: any) => {
-      log(this.importConfig, `Language '${code}' failed to import`, 'error');
-      log(this.importConfig, formatError(error), 'error');
+      if (error?.errorCode === 247) {
+        log(this.importConfig, formatError(error), 'info');
+      } else {
+        log(this.importConfig, `Language '${code}' failed to import`, 'error');
+        log(this.importConfig, formatError(error), 'error');
+      }
       this.failedLocales.push({ uid, code });
     };
     return await this.makeConcurrentCall({
diff --git a/packages/contentstack-import/src/types/default-config.ts b/packages/contentstack-import/src/types/default-config.ts
index c41b949fdb..7e4dfd1067 100644
--- a/packages/contentstack-import/src/types/default-config.ts
+++ b/packages/contentstack-import/src/types/default-config.ts
@@ -140,4 +140,5 @@ export default interface DefaultConfig {
   marketplaceAppEncryptionKey: string;
   getEncryptionKeyMaxRetry: number;
   createBackupDir?: string;
+  overwriteSupportedModules: string[];
 }
diff --git a/packages/contentstack-import/src/types/import-config.ts b/packages/contentstack-import/src/types/import-config.ts
index 1609d00df9..65ea7927a6 100644
--- a/packages/contentstack-import/src/types/import-config.ts
+++ b/packages/contentstack-import/src/types/import-config.ts
@@ -44,6 +44,8 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
   destinationStackName?: string;
   org_uid?: string;
   contentVersion: number;
+  replaceExisting?: boolean;
+  skipExisting?: boolean;
 }
 
 type branch = {
diff --git a/packages/contentstack-import/src/types/index.ts b/packages/contentstack-import/src/types/index.ts
index 104328215f..2b5fee4e28 100644
--- a/packages/contentstack-import/src/types/index.ts
+++ b/packages/contentstack-import/src/types/index.ts
@@ -48,17 +48,18 @@ export type ModuleClassParams = {
   moduleName: Modules;
 };
 
-export interface Extensions{
+export interface Extensions {
   dirName: string;
   fileName: string;
+  validKeys: string[];
   dependencies?: Modules[];
-};
+}
 
-export interface MarketplaceAppsConfig{
+export interface MarketplaceAppsConfig {
   dirName: string;
   fileName: string;
   dependencies?: Modules[];
-};
+}
 
 export interface EnvironmentConfig {
   dirName: string;
@@ -66,23 +67,23 @@ export interface EnvironmentConfig {
   dependencies?: Modules[];
 }
 
-export interface LabelConfig{
+export interface LabelConfig {
   dirName: string;
   fileName: string;
 }
 
-export interface WebhookConfig{
+export interface WebhookConfig {
   dirName: string;
   fileName: string;
 }
 
-export interface WorkflowConfig{
+export interface WorkflowConfig {
   dirName: string;
   fileName: string;
   invalidKeys: string[];
 }
 
-export interface CustomRoleConfig{
+export interface CustomRoleConfig {
   dirName: string;
   fileName: string;
   customRolesLocalesFileName: string;
diff --git a/packages/contentstack-import/src/utils/import-config-handler.ts b/packages/contentstack-import/src/utils/import-config-handler.ts
index d23bb827c4..7aaba9a457 100644
--- a/packages/contentstack-import/src/utils/import-config-handler.ts
+++ b/packages/contentstack-import/src/utils/import-config-handler.ts
@@ -83,6 +83,19 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
   // Note to support old modules
   config.target_stack = config.apiKey;
 
+  config.replaceExisting = importCmdFlags['replace-existing'];
+  config.skipExisting = importCmdFlags['skip-existing'];
+
+  if (config.replaceExisting && !includes(config.overwriteSupportedModules, config.moduleName)) {
+    throw new Error(
+      `Failed to overwrite ${
+        config.moduleName
+      } module! Currently, with the import command, you can overwrite the following modules: ${config.overwriteSupportedModules.join(
+        ',',
+      )}`,
+    );
+  }
+
   return config;
 };
 
diff --git a/packages/contentstack-launch/README.md b/packages/contentstack-launch/README.md
index b922c8ab5d..d939bda965 100755
--- a/packages/contentstack-launch/README.md
+++ b/packages/contentstack-launch/README.md
@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-launch
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-launch/1.0.12 darwin-x64 node-v20.8.0
+@contentstack/cli-launch/1.0.13 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-launch/oclif.manifest.json b/packages/contentstack-launch/oclif.manifest.json
index 834be103c9..2819bc7b0b 100644
--- a/packages/contentstack-launch/oclif.manifest.json
+++ b/packages/contentstack-launch/oclif.manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.12",
+  "version": "1.0.13",
   "commands": {
     "launch:base-command": {
       "id": "launch:base-command",
diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json
index 432ba6f90c..400ff67dc7 100755
--- a/packages/contentstack-launch/package.json
+++ b/packages/contentstack-launch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-launch",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Launch related operations",
   "author": "Contentstack CLI",
   "bin": {
@@ -18,8 +18,8 @@
   ],
   "dependencies": {
     "@apollo/client": "^3.7.9",
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "@oclif/core": "^2.9.3",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^3.3.0",
@@ -50,7 +50,7 @@
     "eslint": "^7.32.0",
     "eslint-config-oclif": "^4",
     "eslint-config-oclif-typescript": "^1.0.3",
-    "oclif": "^3",
+    "oclif": "^3.11.3",
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
diff --git a/packages/contentstack-migrate-rte/README.md b/packages/contentstack-migrate-rte/README.md
index cae7f89667..7cb9201ea9 100644
--- a/packages/contentstack-migrate-rte/README.md
+++ b/packages/contentstack-migrate-rte/README.md
@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-migrate-rte
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-migrate-rte/1.4.12 darwin-x64 node-v20.8.0
+@contentstack/cli-cm-migrate-rte/1.4.13 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json
index 7461111ec6..ac235a1dbc 100644
--- a/packages/contentstack-migrate-rte/package.json
+++ b/packages/contentstack-migrate-rte/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-migrate-rte",
   "description": "Contentstack CLI plugin to migrate HTML RTE to JSON RTE",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "author": "contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "@contentstack/json-rte-serializer": "~2.0.2",
     "collapse-whitespace": "^1.1.7",
     "chalk": "^4.1.2",
@@ -26,7 +26,7 @@
     "globby": "^10.0.2",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
-    "oclif": "^3.8.1",
+    "oclif": "^3.11.3",
     "tslib": "^1.13.0"
   },
   "engines": {
@@ -67,4 +67,4 @@
       "cm:migrate-rte": "O-MGRTRTE"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/contentstack-migration/README.md b/packages/contentstack-migration/README.md
index 907fe7d52e..fbed0cb23b 100644
--- a/packages/contentstack-migration/README.md
+++ b/packages/contentstack-migration/README.md
@@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-migration/1.3.13 darwin-x64 node-v20.8.0
+@contentstack/cli-migration/1.3.14 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
index 8195f5e34f..61be6b7dc9 100644
--- a/packages/contentstack-migration/package.json
+++ b/packages/contentstack-migration/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@contentstack/cli-migration",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "author": "@contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "async": "^3.2.4",
     "callsites": "^3.1.0",
     "cardinal": "^2.1.1",
@@ -26,7 +26,7 @@
     "mkdirp": "^1.0.4",
     "nock": "^13.1.1",
     "nyc": "^15.1.0",
-    "oclif": "^3.8.1"
+    "oclif": "^3.11.3"
   },
   "engines": {
     "node": ">=8.3.0"
@@ -66,4 +66,4 @@
       "cm:migration": "O-MGRTN"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
index 37964ed4b8..9db67abe81 100644
--- a/packages/contentstack-seed/package.json
+++ b/packages/contentstack-seed/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-seed",
   "description": "create a Stack from existing content types, entries, assets, etc.",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.9.0",
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-cm-import": "~1.10.0",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "axios": "1.3.4",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
@@ -74,4 +74,4 @@
     "version": "oclif readme && git add README.md",
     "clean": "rm -rf ./node_modules tsconfig.build.tsbuildinfo"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json
index c9445b92f1..9df6b36e8e 100644
--- a/packages/contentstack-utilities/package.json
+++ b/packages/contentstack-utilities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/contentstack-utilities/src/fs-utility/core.ts b/packages/contentstack-utilities/src/fs-utility/core.ts
index dcfaea4ad8..cef207106f 100644
--- a/packages/contentstack-utilities/src/fs-utility/core.ts
+++ b/packages/contentstack-utilities/src/fs-utility/core.ts
@@ -57,6 +57,7 @@ export default class FsUtility {
       chunkFileSize,
       indexFileName,
       defaultInitContent,
+      useIndexer = false,
       createDirIfNotExist = true,
     } = options;
     this.metaHandler = metaHandler;
@@ -71,6 +72,10 @@ export default class FsUtility {
     this.pageInfo.hasNextPage = keys(this.indexFileContent).length > 0;
     this.defaultInitContent = defaultInitContent || (this.fileExt === 'json' ? '{' : '');
 
+    if (useIndexer) {
+      this.writeIndexer = this.indexFileContent;
+    }
+
     if (createDirIfNotExist) {
       this.createFolderIfNotExist(this.basePath);
     }
diff --git a/packages/contentstack-utilities/src/fs-utility/types.ts b/packages/contentstack-utilities/src/fs-utility/types.ts
index 5525fc998e..a86b99f37b 100644
--- a/packages/contentstack-utilities/src/fs-utility/types.ts
+++ b/packages/contentstack-utilities/src/fs-utility/types.ts
@@ -1,10 +1,6 @@
-type FileType = "json" | "txt";
+type FileType = 'json' | 'txt';
 
-type Chunk =
-  | Record<string, unknown>[]
-  | Record<string, unknown>
-  | Array<unknown>
-  | string;
+type Chunk = Record<string, unknown>[] | Record<string, unknown> | Array<unknown> | string;
 
 type PageInfo = {
   after: number;
@@ -73,6 +69,8 @@ type FsConstructorOptions = {
 
   keepMetadata?: boolean;
 
+  useIndexer?: boolean;
+
   metaHandler?: (array: any) => any;
 };
 
diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
index 9449932ae2..1cabac530d 100644
--- a/packages/contentstack/README.md
+++ b/packages/contentstack/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.9.1 darwin-x64 node-v20.8.0
+@contentstack/cli/1.10.0 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -29,87 +29,169 @@ USAGE
 # Commands
 
 <!-- commands -->
-- [@contentstack/cli](#contentstackcli)
-- [Usage](#usage)
-- [Commands](#commands)
-  - [`csdx auth:login`](#csdx-authlogin)
-  - [`csdx auth:logout`](#csdx-authlogout)
-  - [`csdx auth:tokens`](#csdx-authtokens)
-  - [`csdx auth:tokens:add [-a <value>] [--delivery] [--management] [-e <value>] [-k <value>] [-y] [--token <value>]`](#csdx-authtokensadd--a-value---delivery---management--e-value--k-value--y---token-value)
-  - [`csdx auth:tokens:remove`](#csdx-authtokensremove)
-  - [`csdx auth:whoami`](#csdx-authwhoami)
-  - [`csdx cm::stacks:audit:fix`](#csdx-cmstacksauditfix)
-  - [`csdx cm:assets:publish [-a <value>] [--retry-failed <value>] [-e <value>] [--folder-uid <value>] [--bulk-publish <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmassetspublish--a-value---retry-failed-value--e-value---folder-uid-value---bulk-publish-value--c-value--y---locales-value---branch-value---delivery-token-value---source-env-value)
-  - [`csdx cm:assets:unpublish`](#csdx-cmassetsunpublish)
-  - [`csdx cm:bootstrap`](#csdx-cmbootstrap)
-  - [`csdx cm:branches`](#csdx-cmbranches)
-  - [`csdx cm:branches:create`](#csdx-cmbranchescreate)
-  - [`csdx cm:branches:delete [-uid <value>] [-k <value>]`](#csdx-cmbranchesdelete--uid-value--k-value)
-  - [`csdx cm:branches:diff [--base-branch <value>] [--compare-branch <value>] [-k <value>][--module <value>]`](#csdx-cmbranchesdiff---base-branch-value---compare-branch-value--k-value--module-value)
-  - [`csdx cm:branches:merge [-k <value>][--compare-branch <value>] [--no-revert] [--export-summary-path <value>] [--use-merge-summary <value>] [--comment <value>] [--base-branch <value>]`](#csdx-cmbranchesmerge--k-value--compare-branch-value---no-revert---export-summary-path-value---use-merge-summary-value---comment-value---base-branch-value)
-  - [`csdx cm:bulk-publish`](#csdx-cmbulk-publish)
-  - [`csdx cm:entries:update-and-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-types <value>] [-t <value>] [-e <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>]`](#csdx-cmentriesupdate-and-publish--a-value---retry-failed-value---bulk-publish-value---content-types-value--t-value--e-value--c-value--y---locales-value---branch-value)
-  - [`csdx cm:assets:publish [-a <value>] [--retry-failed <value>] [-e <value>] [--folder-uid <value>] [--bulk-publish <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmassetspublish--a-value---retry-failed-value--e-value---folder-uid-value---bulk-publish-value--c-value--y---locales-value---branch-value---delivery-token-value---source-env-value-1)
-  - [`csdx cm:bulk-publish:clear`](#csdx-cmbulk-publishclear)
-  - [`csdx cm:bulk-publish:configure`](#csdx-cmbulk-publishconfigure)
-  - [`csdx cm:bulk-publish:cross-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-type <value>] [--locales <value>] [--source-env <value>] [--environments <value>] [--delivery-token <value>] [-c <value>] [-y] [--branch <value>] [--onlyAssets] [--onlyEntries]`](#csdx-cmbulk-publishcross-publish--a-value---retry-failed-value---bulk-publish-value---content-type-value---locales-value---source-env-value---environments-value---delivery-token-value--c-value--y---branch-value---onlyassets---onlyentries)
-  - [`csdx cm:entries:publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--publish-all-content-types] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmentriespublish--a-value---retry-failed-value---bulk-publish-value---publish-all-content-types---content-types-value---locales-value--e-value--c-value--y---branch-value---delivery-token-value---source-env-value)
-  - [`csdx cm:entries:publish-modified [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-modified--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value---locales-value--e-value--c-value--y---branch-value)
-  - [`csdx cm:entries:publish-non-localized-fields [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-non-localized-fields--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value--e-value--c-value--y---branch-value)
-  - [`csdx cm:bulk-publish:revert`](#csdx-cmbulk-publishrevert)
-  - [`csdx csdx cm:stacks:unpublish [-a <value>] [-e <value>] [-c <value>] [-y] [--locale <value>] [--branch <value>] [--retry-failed <value>] [--bulk-unpublish <value>] [--content-type <value>] [--delivery-token <value>] [--only-assets] [--only-entries]`](#csdx-csdx-cmstacksunpublish--a-value--e-value--c-value--y---locale-value---branch-value---retry-failed-value---bulk-unpublish-value---content-type-value---delivery-token-value---only-assets---only-entries)
-  - [`csdx cm:entries:publish-only-unpublished [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-only-unpublished--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value---locales-value--e-value--c-value--y---branch-value)
-  - [`csdx cm:entries:migrate-html-rte`](#csdx-cmentriesmigrate-html-rte)
-  - [`csdx cm:entries:publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--publish-all-content-types] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmentriespublish--a-value---retry-failed-value---bulk-publish-value---publish-all-content-types---content-types-value---locales-value--e-value--c-value--y---branch-value---delivery-token-value---source-env-value-1)
-  - [`csdx cm:entries:publish-modified [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-modified--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value---locales-value--e-value--c-value--y---branch-value-1)
-  - [`csdx cm:entries:publish-non-localized-fields [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-non-localized-fields--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value--e-value--c-value--y---branch-value-1)
-  - [`csdx cm:entries:publish-only-unpublished [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-only-unpublished--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value---locales-value--e-value--c-value--y---branch-value-1)
-  - [`csdx cm:entries:unpublish`](#csdx-cmentriesunpublish)
-  - [`csdx cm:entries:update-and-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-types <value>] [-t <value>] [-e <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>]`](#csdx-cmentriesupdate-and-publish--a-value---retry-failed-value---bulk-publish-value---content-types-value--t-value--e-value--c-value--y---locales-value---branch-value-1)
-  - [`csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`](#csdx-cmstacksexport--c-value--k-value--d-value--a-value---module-value---content-types-value---branch-value---secured-assets)
-  - [`csdx cm:export-to-csv`](#csdx-cmexport-to-csv)
-  - [`csdx cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksimport--c-value--k-value--d-value--a-value---module-value---backup-dir-value---branch-value---import-webhook-status-disablecurrent)
-  - [`csdx cm:migrate-rte`](#csdx-cmmigrate-rte)
-  - [`csdx cm:stacks:migration [-k <value>] [-a <value>] [--file-path <value>] [--branch <value>] [--config-file <value>] [--config <value>] [--multiple]`](#csdx-cmstacksmigration--k-value--a-value---file-path-value---branch-value---config-file-value---config-value---multiple)
-  - [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value)
-  - [`csdx cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksclone---source-branch-value---target-branch-value---source-management-token-alias-value---destination-management-token-alias-value--n-value---type-ab---source-stack-api-key-value---destination-stack-api-key-value---import-webhook-status-disablecurrent)
-  - [`csdx cm:stacks:audit`](#csdx-cmstacksaudit)
-  - [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix-1)
-  - [`csdx cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksclone---source-branch-value---target-branch-value---source-management-token-alias-value---destination-management-token-alias-value--n-value---type-ab---source-stack-api-key-value---destination-stack-api-key-value---import-webhook-status-disablecurrent-1)
-  - [`csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`](#csdx-cmstacksexport--c-value--k-value--d-value--a-value---module-value---content-types-value---branch-value---secured-assets-1)
-  - [`csdx cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksimport--c-value--k-value--d-value--a-value---module-value---backup-dir-value---branch-value---import-webhook-status-disablecurrent-1)
-  - [`csdx cm:stacks:migration [-k <value>] [-a <value>] [--file-path <value>] [--branch <value>] [--config-file <value>] [--config <value>] [--multiple]`](#csdx-cmstacksmigration--k-value--a-value---file-path-value---branch-value---config-file-value---config-value---multiple-1)
-  - [`csdx cm:stacks:publish`](#csdx-cmstackspublish)
-  - [`csdx cm:stacks:publish-clear-logs`](#csdx-cmstackspublish-clear-logs)
-  - [`csdx cm:stacks:publish-configure`](#csdx-cmstackspublish-configure)
-  - [`csdx cm:stacks:publish-revert`](#csdx-cmstackspublish-revert)
-  - [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value-1)
-  - [`csdx csdx cm:stacks:unpublish [-a <value>] [-e <value>] [-c <value>] [-y] [--locale <value>] [--branch <value>] [--retry-failed <value>] [--bulk-unpublish <value>] [--content-type <value>] [--delivery-token <value>] [--only-assets] [--only-entries]`](#csdx-csdx-cmstacksunpublish--a-value--e-value--c-value--y---locale-value---branch-value---retry-failed-value---bulk-unpublish-value---content-type-value---delivery-token-value---only-assets---only-entries-1)
-  - [`csdx config:get:base-branch`](#csdx-configgetbase-branch)
-  - [`csdx config:get:region`](#csdx-configgetregion)
-  - [`csdx config:remove:base-branch`](#csdx-configremovebase-branch)
-  - [`csdx config:set:base-branch`](#csdx-configsetbase-branch)
-  - [`csdx config:set:region [REGION]`](#csdx-configsetregion-region)
-  - [`csdx help [COMMANDS]`](#csdx-help-commands)
-  - [`csdx launch`](#csdx-launch)
-  - [`csdx launch:deployments`](#csdx-launchdeployments)
-  - [`csdx launch:environments`](#csdx-launchenvironments)
-  - [`csdx launch:functions`](#csdx-launchfunctions)
-  - [`csdx launch:logs`](#csdx-launchlogs)
-  - [`csdx launch:open`](#csdx-launchopen)
-  - [`csdx login`](#csdx-login)
-  - [`csdx logout`](#csdx-logout)
-  - [`csdx plugins`](#csdx-plugins)
-  - [`csdx plugins:install PLUGIN...`](#csdx-pluginsinstall-plugin)
-  - [`csdx plugins:inspect PLUGIN...`](#csdx-pluginsinspect-plugin)
-  - [`csdx plugins:install PLUGIN...`](#csdx-pluginsinstall-plugin-1)
-  - [`csdx plugins:link PLUGIN`](#csdx-pluginslink-plugin)
-  - [`csdx plugins:uninstall PLUGIN...`](#csdx-pluginsuninstall-plugin)
-  - [`csdx plugins:uninstall PLUGIN...`](#csdx-pluginsuninstall-plugin-1)
-  - [`csdx plugins:uninstall PLUGIN...`](#csdx-pluginsuninstall-plugin-2)
-  - [`csdx plugins:update`](#csdx-pluginsupdate)
-  - [`csdx tokens`](#csdx-tokens)
-  - [`csdx whoami`](#csdx-whoami)
+* [`csdx audit`](#csdx-audit)
+* [`csdx audit:fix`](#csdx-auditfix)
+* [`csdx auth:login`](#csdx-authlogin)
+* [`csdx auth:logout`](#csdx-authlogout)
+* [`csdx auth:tokens`](#csdx-authtokens)
+* [`csdx auth:tokens:add [-a <value>] [--delivery] [--management] [-e <value>] [-k <value>] [-y] [--token <value>]`](#csdx-authtokensadd--a-value---delivery---management--e-value--k-value--y---token-value)
+* [`csdx auth:tokens:remove`](#csdx-authtokensremove)
+* [`csdx auth:whoami`](#csdx-authwhoami)
+* [`csdx cm:assets:publish [-a <value>] [--retry-failed <value>] [-e <value>] [--folder-uid <value>] [--bulk-publish <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmassetspublish--a-value---retry-failed-value--e-value---folder-uid-value---bulk-publish-value--c-value--y---locales-value---branch-value---delivery-token-value---source-env-value)
+* [`csdx cm:assets:unpublish`](#csdx-cmassetsunpublish)
+* [`csdx cm:bootstrap`](#csdx-cmbootstrap)
+* [`csdx cm:branches`](#csdx-cmbranches)
+* [`csdx cm:branches:create`](#csdx-cmbranchescreate)
+* [`csdx cm:branches:delete [-uid <value>] [-k <value>]`](#csdx-cmbranchesdelete--uid-value--k-value)
+* [`csdx cm:branches:diff [--base-branch <value>] [--compare-branch <value>] [-k <value>][--module <value>]`](#csdx-cmbranchesdiff---base-branch-value---compare-branch-value--k-value--module-value)
+* [`csdx cm:branches:merge [-k <value>][--compare-branch <value>] [--no-revert] [--export-summary-path <value>] [--use-merge-summary <value>] [--comment <value>] [--base-branch <value>]`](#csdx-cmbranchesmerge--k-value--compare-branch-value---no-revert---export-summary-path-value---use-merge-summary-value---comment-value---base-branch-value)
+* [`csdx cm:bulk-publish`](#csdx-cmbulk-publish)
+* [`csdx cm:entries:update-and-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-types <value>] [-t <value>] [-e <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>]`](#csdx-cmentriesupdate-and-publish--a-value---retry-failed-value---bulk-publish-value---content-types-value--t-value--e-value--c-value--y---locales-value---branch-value)
+* [`csdx cm:assets:publish [-a <value>] [--retry-failed <value>] [-e <value>] [--folder-uid <value>] [--bulk-publish <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmassetspublish--a-value---retry-failed-value--e-value---folder-uid-value---bulk-publish-value--c-value--y---locales-value---branch-value---delivery-token-value---source-env-value-1)
+* [`csdx cm:bulk-publish:clear`](#csdx-cmbulk-publishclear)
+* [`csdx cm:bulk-publish:configure`](#csdx-cmbulk-publishconfigure)
+* [`csdx cm:bulk-publish:cross-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-type <value>] [--locales <value>] [--source-env <value>] [--environments <value>] [--delivery-token <value>] [-c <value>] [-y] [--branch <value>] [--onlyAssets] [--onlyEntries]`](#csdx-cmbulk-publishcross-publish--a-value---retry-failed-value---bulk-publish-value---content-type-value---locales-value---source-env-value---environments-value---delivery-token-value--c-value--y---branch-value---onlyassets---onlyentries)
+* [`csdx cm:entries:publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--publish-all-content-types] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmentriespublish--a-value---retry-failed-value---bulk-publish-value---publish-all-content-types---content-types-value---locales-value--e-value--c-value--y---branch-value---delivery-token-value---source-env-value)
+* [`csdx cm:entries:publish-modified [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-modified--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value---locales-value--e-value--c-value--y---branch-value)
+* [`csdx cm:entries:publish-non-localized-fields [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-non-localized-fields--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value--e-value--c-value--y---branch-value)
+* [`csdx cm:bulk-publish:revert`](#csdx-cmbulk-publishrevert)
+* [`csdx csdx cm:stacks:unpublish [-a <value>] [-e <value>] [-c <value>] [-y] [--locale <value>] [--branch <value>] [--retry-failed <value>] [--bulk-unpublish <value>] [--content-type <value>] [--delivery-token <value>] [--only-assets] [--only-entries]`](#csdx-csdx-cmstacksunpublish--a-value--e-value--c-value--y---locale-value---branch-value---retry-failed-value---bulk-unpublish-value---content-type-value---delivery-token-value---only-assets---only-entries)
+* [`csdx cm:entries:publish-only-unpublished [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-only-unpublished--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value---locales-value--e-value--c-value--y---branch-value)
+* [`csdx cm:entries:migrate-html-rte`](#csdx-cmentriesmigrate-html-rte)
+* [`csdx cm:entries:publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--publish-all-content-types] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmentriespublish--a-value---retry-failed-value---bulk-publish-value---publish-all-content-types---content-types-value---locales-value--e-value--c-value--y---branch-value---delivery-token-value---source-env-value-1)
+* [`csdx cm:entries:publish-modified [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-modified--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value---locales-value--e-value--c-value--y---branch-value-1)
+* [`csdx cm:entries:publish-non-localized-fields [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-non-localized-fields--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value--e-value--c-value--y---branch-value-1)
+* [`csdx cm:entries:publish-only-unpublished [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--source-env <value>] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>]`](#csdx-cmentriespublish-only-unpublished--a-value---retry-failed-value---bulk-publish-value---source-env-value---content-types-value---locales-value--e-value--c-value--y---branch-value-1)
+* [`csdx cm:entries:unpublish`](#csdx-cmentriesunpublish)
+* [`csdx cm:entries:update-and-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-types <value>] [-t <value>] [-e <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>]`](#csdx-cmentriesupdate-and-publish--a-value---retry-failed-value---bulk-publish-value---content-types-value--t-value--e-value--c-value--y---locales-value---branch-value-1)
+* [`csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`](#csdx-cmstacksexport--c-value--k-value--d-value--a-value---module-value---content-types-value---branch-value---secured-assets)
+* [`csdx cm:export-to-csv`](#csdx-cmexport-to-csv)
+* [`csdx cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksimport--c-value--k-value--d-value--a-value---module-value---backup-dir-value---branch-value---import-webhook-status-disablecurrent)
+* [`csdx cm:migrate-rte`](#csdx-cmmigrate-rte)
+* [`csdx cm:stacks:migration [-k <value>] [-a <value>] [--file-path <value>] [--branch <value>] [--config-file <value>] [--config <value>] [--multiple]`](#csdx-cmstacksmigration--k-value--a-value---file-path-value---branch-value---config-file-value---config-value---multiple)
+* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value)
+* [`csdx cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksclone---source-branch-value---target-branch-value---source-management-token-alias-value---destination-management-token-alias-value--n-value---type-ab---source-stack-api-key-value---destination-stack-api-key-value---import-webhook-status-disablecurrent)
+* [`csdx cm:stacks:audit`](#csdx-cmstacksaudit)
+* [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix)
+* [`csdx cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksclone---source-branch-value---target-branch-value---source-management-token-alias-value---destination-management-token-alias-value--n-value---type-ab---source-stack-api-key-value---destination-stack-api-key-value---import-webhook-status-disablecurrent-1)
+* [`csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`](#csdx-cmstacksexport--c-value--k-value--d-value--a-value---module-value---content-types-value---branch-value---secured-assets-1)
+* [`csdx cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksimport--c-value--k-value--d-value--a-value---module-value---backup-dir-value---branch-value---import-webhook-status-disablecurrent-1)
+* [`csdx cm:stacks:migration [-k <value>] [-a <value>] [--file-path <value>] [--branch <value>] [--config-file <value>] [--config <value>] [--multiple]`](#csdx-cmstacksmigration--k-value--a-value---file-path-value---branch-value---config-file-value---config-value---multiple-1)
+* [`csdx cm:stacks:publish`](#csdx-cmstackspublish)
+* [`csdx cm:stacks:publish-clear-logs`](#csdx-cmstackspublish-clear-logs)
+* [`csdx cm:stacks:publish-configure`](#csdx-cmstackspublish-configure)
+* [`csdx cm:stacks:publish-revert`](#csdx-cmstackspublish-revert)
+* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value-1)
+* [`csdx csdx cm:stacks:unpublish [-a <value>] [-e <value>] [-c <value>] [-y] [--locale <value>] [--branch <value>] [--retry-failed <value>] [--bulk-unpublish <value>] [--content-type <value>] [--delivery-token <value>] [--only-assets] [--only-entries]`](#csdx-csdx-cmstacksunpublish--a-value--e-value--c-value--y---locale-value---branch-value---retry-failed-value---bulk-unpublish-value---content-type-value---delivery-token-value---only-assets---only-entries-1)
+* [`csdx config:get:base-branch`](#csdx-configgetbase-branch)
+* [`csdx config:get:region`](#csdx-configgetregion)
+* [`csdx config:remove:base-branch`](#csdx-configremovebase-branch)
+* [`csdx config:set:base-branch`](#csdx-configsetbase-branch)
+* [`csdx config:set:region [REGION]`](#csdx-configsetregion-region)
+* [`csdx help [COMMANDS]`](#csdx-help-commands)
+* [`csdx launch`](#csdx-launch)
+* [`csdx launch:deployments`](#csdx-launchdeployments)
+* [`csdx launch:environments`](#csdx-launchenvironments)
+* [`csdx launch:functions`](#csdx-launchfunctions)
+* [`csdx launch:logs`](#csdx-launchlogs)
+* [`csdx launch:open`](#csdx-launchopen)
+* [`csdx login`](#csdx-login)
+* [`csdx logout`](#csdx-logout)
+* [`csdx plugins`](#csdx-plugins)
+* [`csdx plugins:install PLUGIN...`](#csdx-pluginsinstall-plugin)
+* [`csdx plugins:inspect PLUGIN...`](#csdx-pluginsinspect-plugin)
+* [`csdx plugins:install PLUGIN...`](#csdx-pluginsinstall-plugin-1)
+* [`csdx plugins:link PLUGIN`](#csdx-pluginslink-plugin)
+* [`csdx plugins:uninstall PLUGIN...`](#csdx-pluginsuninstall-plugin)
+* [`csdx plugins:uninstall PLUGIN...`](#csdx-pluginsuninstall-plugin-1)
+* [`csdx plugins:uninstall PLUGIN...`](#csdx-pluginsuninstall-plugin-2)
+* [`csdx plugins:update`](#csdx-pluginsupdate)
+* [`csdx tokens`](#csdx-tokens)
+* [`csdx whoami`](#csdx-whoami)
+
+## `csdx audit`
+
+Perform audits and find possible errors in the exported Contentstack data
+
+```
+USAGE
+  $ csdx audit [-c <value>] [-d <value>] [--report-path <value>] [--modules
+    content-types|global-fields|entries] [--columns <value> | ] [--sort <value>] [--filter <value>] [--csv |
+    --no-truncate]
+
+FLAGS
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+  --columns=<value>       only show provided columns (comma-separated)
+  --csv                   output is csv format [alias: --output=csv]
+  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --modules=<option>...   Provide the list of modules to be audited
+                          <options: content-types|global-fields|entries>
+  --no-truncate           do not truncate output to fit screen
+  --report-path=<value>   Path to store the audit reports
+  --sort=<value>          property to sort by (prepend '-' for descending)
+
+DESCRIPTION
+  Perform audits and find possible errors in the exported Contentstack data
+
+ALIASES
+  $ csdx audit
+  $ csdx cm:stacks:audit
+
+EXAMPLES
+  $ csdx audit
+
+  $ csdx audit --report-path=<path>
+
+  $ csdx audit --report-path=<path> --csv
+
+  $ csdx audit --report-path=<path> --filter="name=<filter-value>"
+
+  $ csdx audit --report-path=<path> --modules=content-types --filter="name="<filter-value>"
+```
+
+## `csdx audit:fix`
+
+Perform audits and fix possible errors in the exported Contentstack data.
+
+```
+USAGE
+  $ csdx audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
+    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--columns <value> | ] [--sort <value>]
+    [--filter <value>] [--csv | --no-truncate]
+
+FLAGS
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+  --columns=<value>       only show provided columns (comma-separated)
+  --copy-dir              Create backup from the original data.
+  --copy-path=<value>     Provide the path to backup the copied data
+  --csv                   output is csv format [alias: --output=csv]
+  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --modules=<option>...   Provide the list of modules to be audited
+                          <options: content-types|global-fields|entries>
+  --no-truncate           do not truncate output to fit screen
+  --report-path=<value>   Path to store the audit reports
+  --sort=<value>          property to sort by (prepend '-' for descending)
+
+DESCRIPTION
+  Perform audits and fix possible errors in the exported Contentstack data.
+
+ALIASES
+  $ csdx audit:fix
+  $ csdx cm:stacks:audit:fix
+
+EXAMPLES
+  $ csdx audit:fix --copy-dir
+
+  $ csdx audit:fix --report-path=<path> --copy-dir
+
+  $ csdx audit:fix --report-path=<path> --copy-dir --csv
+
+  $ csdx audit:fix --report-path=<path> --filter="name=<filter-value>"
+
+  $ csdx audit:fix --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>
+```
 
 ## `csdx auth:login`
 
@@ -292,30 +374,6 @@ EXAMPLES
 
 _See code: [@contentstack/cli-auth](https://github.com/contentstack/cli/blob/main/packages/contentstack-auth/src/commands/auth/whoami.ts)_
 
-## `csdx cm::stacks:audit:fix`
-
-Audit fix command
-
-```
-USAGE
-  $ csdx cm::stacks:audit:fix [-c <value>] [-d <value>]
-
-FLAGS
-  -c, --config=<value>    Path of the external config
-  -d, --data-dir=<value>  Path and location where data is stored
-
-DESCRIPTION
-  Audit fix command
-
-ALIASES
-  $ csdx cm::stacks:audit:fix
-
-EXAMPLES
-  $ csdx cm::stacks:audit:fix
-```
-
-_See code: [@contentstack/cli-audit](https://github.com/contentstack/audit/blob/main/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts)_
-
 ## `csdx cm:assets:publish [-a <value>] [--retry-failed <value>] [-e <value>] [--folder-uid <value>] [--bulk-publish <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`
 
 Publish assets to the specified environments
@@ -2028,6 +2086,8 @@ FLAGS
   -y, --yes                         [optional] Override marketplace prompts
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
+  --replace-existing                Replaces the existing module in the target stack.
+  --skip-existing                   Skips the module exists warning messages.
 
 DESCRIPTION
   Import content from a stack
@@ -2237,7 +2297,7 @@ EXAMPLES
 
 ## `csdx cm:stacks:audit`
 
-Audit and find possible errors in the exported data
+Perform audits and find possible errors in the exported Contentstack data
 
 ```
 USAGE
@@ -2247,20 +2307,21 @@ USAGE
 
 FLAGS
   -c, --config=<value>    Path of the external config
-  -d, --data-dir=<value>  Path and location where data is stored
+  -d, --data-dir=<value>  Path where the data is stored
   --columns=<value>       only show provided columns (comma-separated)
   --csv                   output is csv format [alias: --output=csv]
   --filter=<value>        filter property by partial string matching, ex: name=foo
-  --modules=<option>...   Provide list of modules to be audited
+  --modules=<option>...   Provide the list of modules to be audited
                           <options: content-types|global-fields|entries>
   --no-truncate           do not truncate output to fit screen
   --report-path=<value>   Path to store the audit reports
   --sort=<value>          property to sort by (prepend '-' for descending)
 
 DESCRIPTION
-  Audit and find possible errors in the exported data
+  Perform audits and find possible errors in the exported Contentstack data
 
 ALIASES
+  $ csdx audit
   $ csdx cm:stacks:audit
 
 EXAMPLES
@@ -2279,24 +2340,45 @@ _See code: [@contentstack/cli-audit](https://github.com/contentstack/audit/blob/
 
 ## `csdx cm:stacks:audit:fix`
 
-Audit fix command
+Perform audits and fix possible errors in the exported Contentstack data.
 
 ```
 USAGE
-  $ csdx cm:stacks:audit:fix [-c <value>] [-d <value>]
+  $ csdx cm:stacks:audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
+    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--columns <value> | ] [--sort <value>]
+    [--filter <value>] [--csv | --no-truncate]
 
 FLAGS
   -c, --config=<value>    Path of the external config
-  -d, --data-dir=<value>  Path and location where data is stored
+  -d, --data-dir=<value>  Path where the data is stored
+  --columns=<value>       only show provided columns (comma-separated)
+  --copy-dir              Create backup from the original data.
+  --copy-path=<value>     Provide the path to backup the copied data
+  --csv                   output is csv format [alias: --output=csv]
+  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --modules=<option>...   Provide the list of modules to be audited
+                          <options: content-types|global-fields|entries>
+  --no-truncate           do not truncate output to fit screen
+  --report-path=<value>   Path to store the audit reports
+  --sort=<value>          property to sort by (prepend '-' for descending)
 
 DESCRIPTION
-  Audit fix command
+  Perform audits and fix possible errors in the exported Contentstack data.
 
 ALIASES
-  $ csdx cm::stacks:audit:fix
+  $ csdx audit:fix
+  $ csdx cm:stacks:audit:fix
 
 EXAMPLES
-  $ csdx cm:stacks:audit:fix
+  $ csdx cm:stacks:audit:fix --copy-dir
+
+  $ csdx cm:stacks:audit:fix --report-path=<path> --copy-dir
+
+  $ csdx cm:stacks:audit:fix --report-path=<path> --copy-dir --csv
+
+  $ csdx cm:stacks:audit:fix --report-path=<path> --filter="name=<filter-value>"
+
+  $ csdx cm:stacks:audit:fix --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>
 ```
 
 _See code: [@contentstack/cli-audit](https://github.com/contentstack/audit/blob/main/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts)_
@@ -2416,6 +2498,8 @@ FLAGS
   -y, --yes                         [optional] Override marketplace prompts
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
+  --replace-existing                Replaces the existing module in the target stack.
+  --skip-existing                   Skips the module exists warning messages.
 
 DESCRIPTION
   Import content from a stack
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
index b98ff0ca7a..aa73bc4db4 100755
--- a/packages/contentstack/package.json
+++ b/packages/contentstack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run"
@@ -22,22 +22,22 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.0.0",
-    "@contentstack/cli-auth": "~1.3.14",
-    "@contentstack/cli-cm-bootstrap": "~1.5.1",
-    "@contentstack/cli-cm-branches": "~1.0.14",
-    "@contentstack/cli-cm-bulk-publish": "~1.3.12",
-    "@contentstack/cli-cm-clone": "~1.5.1",
-    "@contentstack/cli-cm-export": "~1.9.1",
-    "@contentstack/cli-cm-export-to-csv": "~1.4.3",
-    "@contentstack/cli-cm-import": "~1.9.1",
-    "@contentstack/cli-cm-migrate-rte": "~1.4.12",
-    "@contentstack/cli-cm-seed": "~1.5.1",
-    "@contentstack/cli-command": "~1.2.13",
-    "@contentstack/cli-config": "~1.4.12",
-    "@contentstack/cli-launch": "~1.0.12",
-    "@contentstack/cli-migration": "~1.3.13",
-    "@contentstack/cli-utilities": "~1.5.3",
+    "@contentstack/cli-audit": "~1.2.0",
+    "@contentstack/cli-auth": "~1.3.15",
+    "@contentstack/cli-cm-bootstrap": "~1.6.0",
+    "@contentstack/cli-cm-branches": "~1.0.15",
+    "@contentstack/cli-cm-bulk-publish": "~1.3.13",
+    "@contentstack/cli-cm-clone": "~1.6.0",
+    "@contentstack/cli-cm-export": "~1.9.2",
+    "@contentstack/cli-cm-export-to-csv": "~1.4.4",
+    "@contentstack/cli-cm-import": "~1.10.0",
+    "@contentstack/cli-cm-migrate-rte": "~1.4.13",
+    "@contentstack/cli-cm-seed": "~1.6.0",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-config": "~1.4.13",
+    "@contentstack/cli-launch": "~1.0.13",
+    "@contentstack/cli-migration": "~1.3.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "@contentstack/management": "~1.10.0",
     "@oclif/core": "^2.9.3",
     "@oclif/plugin-help": "^5",
@@ -160,4 +160,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 638ea7df43..3c621e4c0d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,22 +10,22 @@ importers:
 
   packages/contentstack:
     specifiers:
-      '@contentstack/cli-audit': ~1.0.0
-      '@contentstack/cli-auth': ~1.3.14
-      '@contentstack/cli-cm-bootstrap': ~1.5.1
-      '@contentstack/cli-cm-branches': ~1.0.14
-      '@contentstack/cli-cm-bulk-publish': ~1.3.12
-      '@contentstack/cli-cm-clone': ~1.5.1
-      '@contentstack/cli-cm-export': ~1.9.1
-      '@contentstack/cli-cm-export-to-csv': ~1.4.3
-      '@contentstack/cli-cm-import': ~1.9.2
-      '@contentstack/cli-cm-migrate-rte': ~1.4.12
-      '@contentstack/cli-cm-seed': ~1.5.1
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-config': ~1.4.12
-      '@contentstack/cli-launch': ~1.0.12
-      '@contentstack/cli-migration': ~1.3.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-audit': ~1.2.0
+      '@contentstack/cli-auth': ~1.3.15
+      '@contentstack/cli-cm-bootstrap': ~1.6.0
+      '@contentstack/cli-cm-branches': ~1.0.15
+      '@contentstack/cli-cm-bulk-publish': ~1.3.13
+      '@contentstack/cli-cm-clone': ~1.6.0
+      '@contentstack/cli-cm-export': ~1.9.2
+      '@contentstack/cli-cm-export-to-csv': ~1.4.4
+      '@contentstack/cli-cm-import': ~1.10.0
+      '@contentstack/cli-cm-migrate-rte': ~1.4.13
+      '@contentstack/cli-cm-seed': ~1.6.0
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-config': ~1.4.13
+      '@contentstack/cli-launch': ~1.0.13
+      '@contentstack/cli-migration': ~1.3.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@contentstack/management': ~1.10.0
       '@oclif/core': ^2.9.3
       '@oclif/plugin-help': ^5
@@ -121,19 +121,22 @@ importers:
 
   packages/contentstack-audit:
     specifiers:
-      '@contentstack/cli-command': ~1.2.11
-      '@contentstack/cli-utilities': ~1.5.1
-      '@oclif/plugin-help': ^5.2.20
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
+      '@oclif/plugin-help': ^5
       '@oclif/plugin-plugins': ^3.8.4
       '@oclif/test': ^2.0.3
       '@types/chai': ^4.3.5
+      '@types/fs-extra': ^11.0.2
       '@types/node': ^20.3.1
+      '@types/uuid': ^9.0.4
       chai: ^4.3.7
       chalk: ^4.1.2
       eslint: ^8.43.0
       eslint-config-oclif: ^4.0.0
       eslint-config-oclif-typescript: ^1.0.3
       fast-csv: ^4.3.6
+      fs-extra: ^11.1.1
       lodash: ^4.17.21
       mocha: ^10.2.0
       nyc: ^15.1.0
@@ -142,7 +145,8 @@ importers:
       ts-node: ^10.9.1
       tslib: ^2.5.3
       typescript: ^5.1.3
-      winston: ^3.9.0
+      uuid: ^9.0.1
+      winston: ^3.10.0
     dependencies:
       '@contentstack/cli-command': link:../contentstack-command
       '@contentstack/cli-utilities': link:../contentstack-utilities
@@ -150,12 +154,16 @@ importers:
       '@oclif/plugin-plugins': 3.8.4_eyayto62fyd4eo5o5fvolpu7d4
       chalk: 4.1.2
       fast-csv: 4.3.6
+      fs-extra: 11.1.1
       lodash: 4.17.21
+      uuid: 9.0.1
       winston: 3.10.0
     devDependencies:
       '@oclif/test': 2.3.31_eyayto62fyd4eo5o5fvolpu7d4
       '@types/chai': 4.3.5
+      '@types/fs-extra': 11.0.2
       '@types/node': 20.6.5
+      '@types/uuid': 9.0.4
       chai: 4.3.7
       eslint: 8.45.0
       eslint-config-oclif: 4.0.0_eslint@8.45.0
@@ -171,7 +179,7 @@ importers:
   packages/contentstack-auth:
     specifiers:
       '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-utilities': ~1.5.4
       '@fancy-test/nock': ^0.1.1
       '@oclif/plugin-help': ^5.1.19
       '@oclif/test': ^2.2.10
@@ -233,9 +241,9 @@ importers:
 
   packages/contentstack-bootstrap:
     specifiers:
-      '@contentstack/cli-cm-seed': ~1.5.0
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-cm-seed': ~1.6.0
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/test': ^2.2.10
       '@types/inquirer': ^9.0.3
       '@types/mkdirp': ^1.0.1
@@ -363,8 +371,8 @@ importers:
 
   packages/contentstack-bulk-publish:
     specifiers:
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/test': ^1.2.6
       bluebird: ^3.7.2
       chai: ^4.2.0
@@ -408,9 +416,9 @@ importers:
     specifiers:
       '@colors/colors': ^1.5.0
       '@contentstack/cli-cm-export': ~1.9.0
-      '@contentstack/cli-cm-import': ~1.9.0
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-cm-import': ~1.10.0
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/test': ^1.2.7
       async: ^3.2.4
       chai: ^4.2.0
@@ -459,7 +467,7 @@ importers:
 
   packages/contentstack-command:
     specifiers:
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/test': ^2.2.10
       '@types/chai': ^4.2.18
       '@types/mkdirp': ^1.0.1
@@ -500,8 +508,8 @@ importers:
 
   packages/contentstack-config:
     specifiers:
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/test': ^2.2.10
       '@types/chai': ^4.2.18
       '@types/inquirer': ^9.0.3
@@ -585,10 +593,10 @@ importers:
   packages/contentstack-export:
     specifiers:
       '@contentstack/cli-auth': ~1.3.14
-      '@contentstack/cli-command': ~1.2.13
+      '@contentstack/cli-command': ~1.2.14
       '@contentstack/cli-config': ~1.4.11
       '@contentstack/cli-dev-dependencies': ~1.2.3
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/core': ^2.9.3
       '@oclif/plugin-help': ^5.1.19
       '@oclif/test': ^1.2.6
@@ -665,8 +673,8 @@ importers:
 
   packages/contentstack-export-to-csv:
     specifiers:
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/test': ^2.2.10
       chai: ^4.2.0
       chalk: ^4.1.0
@@ -702,8 +710,8 @@ importers:
 
   packages/contentstack-import:
     specifiers:
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@contentstack/management': ~1.10.2
       '@oclif/core': ^2.9.3
       '@oclif/test': ^1.2.6
@@ -786,8 +794,8 @@ importers:
   packages/contentstack-launch:
     specifiers:
       '@apollo/client': ^3.7.9
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/core': ^2.9.3
       '@oclif/plugin-help': ^5
       '@oclif/plugin-plugins': ^3.3.0
@@ -814,7 +822,7 @@ importers:
       graphql: ^16.8.1
       ini: ^3.0.1
       lodash: ^4.17.21
-      oclif: ^3
+      oclif: ^3.11.3
       open: ^8.4.2
       shx: ^0.3.3
       ts-node: ^10.9.1
@@ -854,7 +862,7 @@ importers:
       eslint: 7.32.0
       eslint-config-oclif: 4.0.0_eslint@7.32.0
       eslint-config-oclif-typescript: 1.0.3_jofidmxrjzhj7l6vknpw5ecvfe
-      oclif: 3.9.1_npeoqfxwgl5njwqojmpesqhar4
+      oclif: 3.17.1_npeoqfxwgl5njwqojmpesqhar4
       shx: 0.3.4
       ts-node: 10.9.1_npeoqfxwgl5njwqojmpesqhar4
       tslib: 2.6.0
@@ -862,8 +870,8 @@ importers:
 
   packages/contentstack-migrate-rte:
     specifiers:
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@contentstack/json-rte-serializer': ~2.0.2
       '@oclif/test': ^2.2.10
       chai: ^4.3.4
@@ -878,7 +886,7 @@ importers:
       mocha: ^10.0.0
       nock: ^13.1.0
       nyc: ^15.1.0
-      oclif: ^3.8.1
+      oclif: ^3.11.3
       omit-deep-lodash: ^1.1.5
       sinon: ^15.0.1
       tslib: ^1.13.0
@@ -904,13 +912,13 @@ importers:
       globby: 10.0.2
       mocha: 10.1.0
       nyc: 15.1.0
-      oclif: 3.9.1
+      oclif: 3.17.1
       tslib: 1.14.1
 
   packages/contentstack-migration:
     specifiers:
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/test': ^2.2.10
       async: ^3.2.4
       callsites: ^3.1.0
@@ -928,7 +936,7 @@ importers:
       mkdirp: ^1.0.4
       nock: ^13.1.1
       nyc: ^15.1.0
-      oclif: ^3.8.1
+      oclif: ^3.11.3
       winston: ^3.7.2
     dependencies:
       '@contentstack/cli-command': link:../contentstack-command
@@ -952,13 +960,13 @@ importers:
       mkdirp: 1.0.4
       nock: 13.3.2
       nyc: 15.1.0
-      oclif: 3.9.1
+      oclif: 3.17.1
 
   packages/contentstack-seed:
     specifiers:
-      '@contentstack/cli-cm-import': ~1.9.0
-      '@contentstack/cli-command': ~1.2.13
-      '@contentstack/cli-utilities': ~1.5.3
+      '@contentstack/cli-cm-import': ~1.10.0
+      '@contentstack/cli-command': ~1.2.14
+      '@contentstack/cli-utilities': ~1.5.4
       '@oclif/plugin-help': ^5.1.19
       '@types/inquirer': ^9.0.3
       '@types/jest': ^26.0.15
@@ -2726,6 +2734,7 @@ packages:
       - '@swc/wasm'
       - '@types/node'
       - typescript
+    dev: false
 
   /@oclif/plugin-help/5.2.14_typescript@4.9.5:
     resolution: {integrity: sha512-7hMLc6zqxeRfG4nvHHQPpbaBj60efM3ULFkCpHZkdLms/ezIkNo40F661QuraIjMP/NN+U6VSfBCGuPkRyxVkA==}
@@ -2739,6 +2748,18 @@ packages:
       - typescript
     dev: true
 
+  /@oclif/plugin-help/5.2.20:
+    resolution: {integrity: sha512-u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@oclif/core': 2.15.0
+    transitivePeerDependencies:
+      - '@swc/core'
+      - '@swc/wasm'
+      - '@types/node'
+      - typescript
+    dev: true
+
   /@oclif/plugin-help/5.2.20_eyayto62fyd4eo5o5fvolpu7d4:
     resolution: {integrity: sha512-u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ==}
     engines: {node: '>=12.0.0'}
@@ -2750,6 +2771,18 @@ packages:
       - '@types/node'
       - typescript
 
+  /@oclif/plugin-help/5.2.20_npeoqfxwgl5njwqojmpesqhar4:
+    resolution: {integrity: sha512-u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@oclif/core': 2.15.0_npeoqfxwgl5njwqojmpesqhar4
+    transitivePeerDependencies:
+      - '@swc/core'
+      - '@swc/wasm'
+      - '@types/node'
+      - typescript
+    dev: true
+
   /@oclif/plugin-not-found/2.4.0:
     resolution: {integrity: sha512-EOoesBEgyj4TMdHUpnCqN7qqH0f1NHh7buTdWfhwlSjbfrL9rAuodiART5/zgtsj5b8uao3aXdcx1gPxWOogEw==}
     engines: {node: '>=12.0.0'}
@@ -3420,6 +3453,13 @@ packages:
       '@types/node': 20.6.5
     dev: true
 
+  /@types/fs-extra/11.0.2:
+    resolution: {integrity: sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ==}
+    dependencies:
+      '@types/jsonfile': 6.1.1
+      '@types/node': 20.6.5
+    dev: true
+
   /@types/glob/7.2.0:
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
     dependencies:
@@ -3642,6 +3682,10 @@ packages:
     resolution: {integrity: sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==}
     dev: false
 
+  /@types/uuid/9.0.4:
+    resolution: {integrity: sha512-zAuJWQflfx6dYJM62vna+Sn5aeSWhh3OB+wfUEACNcqUSc0AGc5JKl+ycL1vrH7frGTXhJchYjE1Hak8L819dA==}
+    dev: true
+
   /@types/vinyl/2.0.7:
     resolution: {integrity: sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==}
     dependencies:
@@ -10215,6 +10259,41 @@ packages:
     resolution: {integrity: sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==}
     engines: {node: '>= 10'}
 
+  /oclif/3.17.1:
+    resolution: {integrity: sha512-qwop0W9s5nJJ9tTdLsYXxxvGSNc9xKjXccEAGCXM+x8NmGtZ4P89FwqDY4PIG7IeV9VNpYhZKQArpZNwPGn0CQ==}
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+    dependencies:
+      '@oclif/core': 2.15.0
+      '@oclif/plugin-help': 5.2.20
+      '@oclif/plugin-not-found': 2.4.0
+      '@oclif/plugin-warn-if-update-available': 2.0.44
+      async-retry: 1.3.3
+      aws-sdk: 2.1418.0
+      concurrently: 7.6.0
+      debug: 4.3.4
+      find-yarn-workspace-root: 2.0.0
+      fs-extra: 8.1.0
+      github-slugger: 1.5.0
+      got: 11.8.6
+      lodash: 4.17.21
+      normalize-package-data: 3.0.3
+      semver: 7.5.4
+      shelljs: 0.8.5
+      tslib: 2.6.2
+      yeoman-environment: 3.19.3
+      yeoman-generator: 5.9.0_yeoman-environment@3.19.3
+    transitivePeerDependencies:
+      - '@swc/core'
+      - '@swc/wasm'
+      - '@types/node'
+      - bluebird
+      - encoding
+      - mem-fs
+      - supports-color
+      - typescript
+    dev: true
+
   /oclif/3.17.1_eyayto62fyd4eo5o5fvolpu7d4:
     resolution: {integrity: sha512-qwop0W9s5nJJ9tTdLsYXxxvGSNc9xKjXccEAGCXM+x8NmGtZ4P89FwqDY4PIG7IeV9VNpYhZKQArpZNwPGn0CQ==}
     engines: {node: '>=12.0.0'}
@@ -10250,15 +10329,16 @@ packages:
       - typescript
     dev: true
 
-  /oclif/3.9.1:
-    resolution: {integrity: sha512-gJ8gJrohFY8qEeVBOw7wgAFdwPt2CTTkEFXDTkfUeXap6URIy6ngP7g/E1A2zFt2I0wH/qQHwcfuTpfBbj1+Uw==}
+  /oclif/3.17.1_npeoqfxwgl5njwqojmpesqhar4:
+    resolution: {integrity: sha512-qwop0W9s5nJJ9tTdLsYXxxvGSNc9xKjXccEAGCXM+x8NmGtZ4P89FwqDY4PIG7IeV9VNpYhZKQArpZNwPGn0CQ==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      '@oclif/core': 2.15.0
-      '@oclif/plugin-help': 5.2.14
-      '@oclif/plugin-not-found': 2.4.0
-      '@oclif/plugin-warn-if-update-available': 2.0.44
+      '@oclif/core': 2.15.0_npeoqfxwgl5njwqojmpesqhar4
+      '@oclif/plugin-help': 5.2.20_npeoqfxwgl5njwqojmpesqhar4
+      '@oclif/plugin-not-found': 2.4.0_npeoqfxwgl5njwqojmpesqhar4
+      '@oclif/plugin-warn-if-update-available': 2.0.44_npeoqfxwgl5njwqojmpesqhar4
+      async-retry: 1.3.3
       aws-sdk: 2.1418.0
       concurrently: 7.6.0
       debug: 4.3.4
@@ -10270,10 +10350,9 @@ packages:
       normalize-package-data: 3.0.3
       semver: 7.5.4
       shelljs: 0.8.5
-      tslib: 2.6.0
+      tslib: 2.6.2
       yeoman-environment: 3.19.3
       yeoman-generator: 5.9.0_yeoman-environment@3.19.3
-      yosay: 2.0.2
     transitivePeerDependencies:
       - '@swc/core'
       - '@swc/wasm'
@@ -10285,15 +10364,15 @@ packages:
       - typescript
     dev: true
 
-  /oclif/3.9.1_4qcp7qp4jxxdgb4qbxgwox4hwq:
+  /oclif/3.9.1:
     resolution: {integrity: sha512-gJ8gJrohFY8qEeVBOw7wgAFdwPt2CTTkEFXDTkfUeXap6URIy6ngP7g/E1A2zFt2I0wH/qQHwcfuTpfBbj1+Uw==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      '@oclif/core': 2.15.0_4qcp7qp4jxxdgb4qbxgwox4hwq
-      '@oclif/plugin-help': 5.2.14_4qcp7qp4jxxdgb4qbxgwox4hwq
-      '@oclif/plugin-not-found': 2.4.0_4qcp7qp4jxxdgb4qbxgwox4hwq
-      '@oclif/plugin-warn-if-update-available': 2.0.44_4qcp7qp4jxxdgb4qbxgwox4hwq
+      '@oclif/core': 2.15.0
+      '@oclif/plugin-help': 5.2.14
+      '@oclif/plugin-not-found': 2.4.0
+      '@oclif/plugin-warn-if-update-available': 2.0.44
       aws-sdk: 2.1418.0
       concurrently: 7.6.0
       debug: 4.3.4
@@ -10320,15 +10399,15 @@ packages:
       - typescript
     dev: true
 
-  /oclif/3.9.1_bluebird@3.7.2:
+  /oclif/3.9.1_4qcp7qp4jxxdgb4qbxgwox4hwq:
     resolution: {integrity: sha512-gJ8gJrohFY8qEeVBOw7wgAFdwPt2CTTkEFXDTkfUeXap6URIy6ngP7g/E1A2zFt2I0wH/qQHwcfuTpfBbj1+Uw==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      '@oclif/core': 2.15.0
-      '@oclif/plugin-help': 5.2.14
-      '@oclif/plugin-not-found': 2.4.0
-      '@oclif/plugin-warn-if-update-available': 2.0.44
+      '@oclif/core': 2.15.0_4qcp7qp4jxxdgb4qbxgwox4hwq
+      '@oclif/plugin-help': 5.2.14_4qcp7qp4jxxdgb4qbxgwox4hwq
+      '@oclif/plugin-not-found': 2.4.0_4qcp7qp4jxxdgb4qbxgwox4hwq
+      '@oclif/plugin-warn-if-update-available': 2.0.44_4qcp7qp4jxxdgb4qbxgwox4hwq
       aws-sdk: 2.1418.0
       concurrently: 7.6.0
       debug: 4.3.4
@@ -10341,8 +10420,8 @@ packages:
       semver: 7.5.4
       shelljs: 0.8.5
       tslib: 2.6.0
-      yeoman-environment: 3.19.3_bluebird@3.7.2
-      yeoman-generator: 5.9.0_nqs3lknjmcjhmksixfhcryndrq
+      yeoman-environment: 3.19.3
+      yeoman-generator: 5.9.0_yeoman-environment@3.19.3
       yosay: 2.0.2
     transitivePeerDependencies:
       - '@swc/core'
@@ -10355,15 +10434,15 @@ packages:
       - typescript
     dev: true
 
-  /oclif/3.9.1_fxnscsehfcewpnie2ltbcrhxa4:
+  /oclif/3.9.1_bluebird@3.7.2:
     resolution: {integrity: sha512-gJ8gJrohFY8qEeVBOw7wgAFdwPt2CTTkEFXDTkfUeXap6URIy6ngP7g/E1A2zFt2I0wH/qQHwcfuTpfBbj1+Uw==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      '@oclif/core': 2.15.0_typescript@4.9.5
-      '@oclif/plugin-help': 5.2.14_typescript@4.9.5
-      '@oclif/plugin-not-found': 2.4.0_typescript@4.9.5
-      '@oclif/plugin-warn-if-update-available': 2.0.44_typescript@4.9.5
+      '@oclif/core': 2.15.0
+      '@oclif/plugin-help': 5.2.14
+      '@oclif/plugin-not-found': 2.4.0
+      '@oclif/plugin-warn-if-update-available': 2.0.44
       aws-sdk: 2.1418.0
       concurrently: 7.6.0
       debug: 4.3.4
@@ -10390,15 +10469,15 @@ packages:
       - typescript
     dev: true
 
-  /oclif/3.9.1_npeoqfxwgl5njwqojmpesqhar4:
+  /oclif/3.9.1_fxnscsehfcewpnie2ltbcrhxa4:
     resolution: {integrity: sha512-gJ8gJrohFY8qEeVBOw7wgAFdwPt2CTTkEFXDTkfUeXap6URIy6ngP7g/E1A2zFt2I0wH/qQHwcfuTpfBbj1+Uw==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      '@oclif/core': 2.15.0_npeoqfxwgl5njwqojmpesqhar4
-      '@oclif/plugin-help': 5.2.14_npeoqfxwgl5njwqojmpesqhar4
-      '@oclif/plugin-not-found': 2.4.0_npeoqfxwgl5njwqojmpesqhar4
-      '@oclif/plugin-warn-if-update-available': 2.0.44_npeoqfxwgl5njwqojmpesqhar4
+      '@oclif/core': 2.15.0_typescript@4.9.5
+      '@oclif/plugin-help': 5.2.14_typescript@4.9.5
+      '@oclif/plugin-not-found': 2.4.0_typescript@4.9.5
+      '@oclif/plugin-warn-if-update-available': 2.0.44_typescript@4.9.5
       aws-sdk: 2.1418.0
       concurrently: 7.6.0
       debug: 4.3.4
@@ -10411,8 +10490,8 @@ packages:
       semver: 7.5.4
       shelljs: 0.8.5
       tslib: 2.6.0
-      yeoman-environment: 3.19.3
-      yeoman-generator: 5.9.0_yeoman-environment@3.19.3
+      yeoman-environment: 3.19.3_bluebird@3.7.2
+      yeoman-generator: 5.9.0_nqs3lknjmcjhmksixfhcryndrq
       yosay: 2.0.2
     transitivePeerDependencies:
       - '@swc/core'
@@ -12768,6 +12847,11 @@ packages:
     hasBin: true
     dev: false
 
+  /uuid/9.0.1:
+    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    hasBin: true
+    dev: false
+
   /v8-compile-cache-lib/3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}