diff --git a/docs/usage.md b/docs/usage.md
index be1e0f37f84..7ef1d823812 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -29,7 +29,7 @@ $ npm install -g @asyncapi/cli
 $ asyncapi COMMAND
 running command...
 $ asyncapi (--version)
-@asyncapi/cli/0.58.3 linux-x64 node-v18.18.0
+@asyncapi/cli/0.58.4 linux-x64 node-v18.18.0
 $ asyncapi --help [COMMAND]
 USAGE
   $ asyncapi COMMAND
@@ -93,7 +93,7 @@ EXAMPLES
   $ asyncapi bundle ./asyncapi.yaml ./features.yaml --base ./asyncapi.yaml --reference-into-components
 ```
 
-_See code: [src/commands/bundle.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/bundle.ts)_
+_See code: [src/commands/bundle.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/bundle.ts)_
 
 ## `asyncapi config`
 
@@ -107,7 +107,7 @@ DESCRIPTION
   CLI config settings
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/index.ts)_
 
 ## `asyncapi config context`
 
@@ -121,7 +121,7 @@ DESCRIPTION
   Manage short aliases for full paths to AsyncAPI documents
 ```
 
-_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/context/index.ts)_
+_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/context/index.ts)_
 
 ## `asyncapi config context add CONTEXT-NAME SPEC-FILE-PATH`
 
@@ -143,7 +143,7 @@ DESCRIPTION
   Add a context to the store
 ```
 
-_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/context/add.ts)_
+_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/context/add.ts)_
 
 ## `asyncapi config context current`
 
@@ -160,7 +160,7 @@ DESCRIPTION
   Shows the current context that is being used
 ```
 
-_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/context/current.ts)_
+_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/context/current.ts)_
 
 ## `asyncapi config context edit CONTEXT-NAME NEW-SPEC-FILE-PATH`
 
@@ -181,7 +181,7 @@ DESCRIPTION
   Edit a context in the store
 ```
 
-_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/context/edit.ts)_
+_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/context/edit.ts)_
 
 ## `asyncapi config context init [CONTEXT-FILE-PATH]`
 
@@ -204,7 +204,7 @@ DESCRIPTION
   Initialize context
 ```
 
-_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/context/init.ts)_
+_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/context/init.ts)_
 
 ## `asyncapi config context list`
 
@@ -221,7 +221,7 @@ DESCRIPTION
   List all the stored contexts in the store
 ```
 
-_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/context/list.ts)_
+_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/context/list.ts)_
 
 ## `asyncapi config context remove CONTEXT-NAME`
 
@@ -241,7 +241,7 @@ DESCRIPTION
   Delete a context from the store
 ```
 
-_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/context/remove.ts)_
+_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/context/remove.ts)_
 
 ## `asyncapi config context use CONTEXT-NAME`
 
@@ -261,7 +261,7 @@ DESCRIPTION
   Set a context as current
 ```
 
-_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/context/use.ts)_
+_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/context/use.ts)_
 
 ## `asyncapi config versions`
 
@@ -278,7 +278,7 @@ DESCRIPTION
   Show versions of AsyncAPI tools used
 ```
 
-_See code: [src/commands/config/versions.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/config/versions.ts)_
+_See code: [src/commands/config/versions.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/config/versions.ts)_
 
 ## `asyncapi convert [SPEC-FILE]`
 
@@ -300,7 +300,7 @@ DESCRIPTION
   Convert asyncapi documents older to newer versions
 ```
 
-_See code: [src/commands/convert.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/convert.ts)_
+_See code: [src/commands/convert.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/convert.ts)_
 
 ## `asyncapi diff OLD NEW`
 
@@ -355,7 +355,7 @@ DESCRIPTION
   Find diff between two asyncapi files
 ```
 
-_See code: [src/commands/diff.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/diff.ts)_
+_See code: [src/commands/diff.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/diff.ts)_
 
 ## `asyncapi generate`
 
@@ -369,7 +369,7 @@ DESCRIPTION
   Generate typed models or other things like clients, applications or docs using AsyncAPI Generator templates.
 ```
 
-_See code: [src/commands/generate/index.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/generate/index.ts)_
+_See code: [src/commands/generate/index.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/generate/index.ts)_
 
 ## `asyncapi generate fromTemplate ASYNCAPI TEMPLATE`
 
@@ -406,7 +406,7 @@ EXAMPLES
   $ asyncapi generate fromTemplate asyncapi.yaml @asyncapi/html-template --param version=1.0.0 singleFile=true --output ./docs --force-write
 ```
 
-_See code: [src/commands/generate/fromTemplate.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/generate/fromTemplate.ts)_
+_See code: [src/commands/generate/fromTemplate.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/generate/fromTemplate.ts)_
 
 ## `asyncapi generate models LANGUAGE FILE`
 
@@ -480,7 +480,7 @@ DESCRIPTION
   Generates typed models
 ```
 
-_See code: [src/commands/generate/models.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/generate/models.ts)_
+_See code: [src/commands/generate/models.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/generate/models.ts)_
 
 ## `asyncapi new`
 
@@ -535,7 +535,7 @@ EXAMPLES
   $ asyncapi new --file-name=my-asyncapi.yml --example=default-example.yml --no-tty	 - create a new file with a specific name, using one of the examples and without interactive mode
 ```
 
-_See code: [src/commands/new/index.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/new/index.ts)_
+_See code: [src/commands/new/index.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/new/index.ts)_
 
 ## `asyncapi new file`
 
@@ -590,7 +590,7 @@ EXAMPLES
   $ asyncapi new --file-name=my-asyncapi.yml --example=default-example.yml --no-tty	 - create a new file with a specific name, using one of the examples and without interactive mode
 ```
 
-_See code: [src/commands/new/file.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/new/file.ts)_
+_See code: [src/commands/new/file.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/new/file.ts)_
 
 ## `asyncapi new glee`
 
@@ -608,7 +608,7 @@ DESCRIPTION
   Creates a new Glee project
 ```
 
-_See code: [src/commands/new/glee.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/new/glee.ts)_
+_See code: [src/commands/new/glee.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/new/glee.ts)_
 
 ## `asyncapi new project`
 
@@ -626,7 +626,7 @@ DESCRIPTION
   Creates a new Glee project
 ```
 
-_See code: [src/commands/new/project.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/new/project.ts)_
+_See code: [src/commands/new/project.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/new/project.ts)_
 
 ## `asyncapi optimize [SPEC-FILE]`
 
@@ -662,7 +662,7 @@ EXAMPLES
   $ asyncapi optimize ./asyncapi.yaml --optimization=remove-components,reuse-components,move-to-components --output=terminal --no-tty
 ```
 
-_See code: [src/commands/optimize.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/optimize.ts)_
+_See code: [src/commands/optimize.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/optimize.ts)_
 
 ## `asyncapi start`
 
@@ -676,7 +676,7 @@ DESCRIPTION
   Start asyncapi studio
 ```
 
-_See code: [src/commands/start/index.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/start/index.ts)_
+_See code: [src/commands/start/index.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/start/index.ts)_
 
 ## `asyncapi start studio`
 
@@ -695,7 +695,7 @@ DESCRIPTION
   starts a new local instance of Studio
 ```
 
-_See code: [src/commands/start/studio.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/start/studio.ts)_
+_See code: [src/commands/start/studio.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/start/studio.ts)_
 
 ## `asyncapi validate [SPEC-FILE]`
 
@@ -722,5 +722,5 @@ DESCRIPTION
   validate asyncapi file
 ```
 
-_See code: [src/commands/validate.ts](https://github.com/asyncapi/cli/blob/v0.58.3/src/commands/validate.ts)_
+_See code: [src/commands/validate.ts](https://github.com/asyncapi/cli/blob/v0.58.4/src/commands/validate.ts)_
 <!-- commandsstop -->
diff --git a/package-lock.json b/package-lock.json
index 3c9f52d2c14..e00adcca184 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,19 @@
 {
   "name": "@asyncapi/cli",
-  "version": "0.58.4",
+  "version": "0.58.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@asyncapi/cli",
-      "version": "0.58.4",
+      "version": "0.58.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@asyncapi/avro-schema-parser": "^3.0.2",
         "@asyncapi/bundler": "^0.3.8",
         "@asyncapi/converter": "^1.3.1",
         "@asyncapi/diff": "^0.4.1",
-        "@asyncapi/generator": "^1.13.0",
+        "@asyncapi/generator": "^1.13.1",
         "@asyncapi/modelina": "^1.9.0",
         "@asyncapi/openapi-schema-parser": "^3.0.3",
         "@asyncapi/optimizer": "^0.2.1",
@@ -24,7 +24,7 @@
         "@oclif/core": "^1.26.2",
         "@oclif/errors": "^1.3.6",
         "@oclif/plugin-not-found": "^2.3.22",
-        "@smoya/multi-parser": "^3.0.0",
+        "@smoya/multi-parser": "^4.0.0",
         "@stoplight/spectral-cli": "6.9.0",
         "ajv": "^8.12.0",
         "chalk": "^4.1.0",
@@ -406,14 +406,14 @@
       }
     },
     "node_modules/@asyncapi/generator": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@asyncapi/generator/-/generator-1.13.0.tgz",
-      "integrity": "sha512-/BMhghTa1dVbVBleavcDanf5BFIFYY4aa0uThvRa/5R5D/8brErGIa8+RO1ePYn2n+BxlHkU8z0pIT5lpsgvlw==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/@asyncapi/generator/-/generator-1.13.1.tgz",
+      "integrity": "sha512-+6pQE9OlXue79AO0hMJwlzwH48vED/rPGU1NAQlDyuTvo8599JTd3zUPFDafExRn/arQltJPDE+Z5jtNBifXjw==",
       "dependencies": {
         "@asyncapi/generator-react-sdk": "^0.2.23",
         "@asyncapi/parser": "2.1.0",
         "@npmcli/arborist": "^2.2.4",
-        "@smoya/multi-parser": "3.0.0",
+        "@smoya/multi-parser": "^4.0.0",
         "ajv": "^8.12.0",
         "chokidar": "^3.4.0",
         "commander": "^6.1.0",
@@ -5459,16 +5459,16 @@
       }
     },
     "node_modules/@smoya/multi-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smoya/multi-parser/-/multi-parser-3.0.0.tgz",
-      "integrity": "sha512-HtA/Png8FQ2vwiKKMSOqNkYGERUFqieeekwtuMsImmgnaiacyq97itehbep179qO/TvHb+3luRZAJ433fHgIxg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smoya/multi-parser/-/multi-parser-4.0.0.tgz",
+      "integrity": "sha512-NgPxSaB3YqwrIVe7AtQ/wh9I2J0BHR4lP0PdqirYYrc0XXRwdDjIRrywEc2jjECWsL7tuGU/QtGMGIVaJe6ZYA==",
       "dependencies": {
         "@asyncapi/avro-schema-parser": "^3.0.3",
         "@asyncapi/openapi-schema-parser": "^3.0.4",
         "@asyncapi/protobuf-schema-parser": "^3.0.0",
         "@asyncapi/raml-dt-schema-parser": "^4.0.4",
         "parserv2": "npm:@asyncapi/parser@^2.1.0",
-        "parserv3": "npm:@asyncapi/parser@^2.2.0-next-major-spec.2"
+        "parserv3": "npm:@asyncapi/parser@^3.0.0-next-major-spec.3"
       }
     },
     "node_modules/@stoplight/better-ajv-errors": {
@@ -15267,9 +15267,9 @@
     },
     "node_modules/parserv3": {
       "name": "@asyncapi/parser",
-      "version": "2.2.0-next-major-spec.2",
-      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-2.2.0-next-major-spec.2.tgz",
-      "integrity": "sha512-KkS+sPCHFFPZrFzzx4UGiYDrDfJI583AksLFg6QUKwr5Wjq8o7cIC3Hel2ptaRVv5x1nJz0o6QzFeY7VIWCc1g==",
+      "version": "3.0.0-next-major-spec.3",
+      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.0-next-major-spec.3.tgz",
+      "integrity": "sha512-LCrAQqJpGxraMyU2k1Nh1X6Q1dz7a/YhTRRFFrQHOEo+TUT/kRdoUkRDP++e58dO7h9MBN+/hZK5TaqE+/jQiw==",
       "dependencies": {
         "@asyncapi/specs": "^6.0.0-next-major-spec.6",
         "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0",
diff --git a/package.json b/package.json
index 4043b580f4c..aa9a1391223 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "0.58.4",
+  "version": "0.58.5",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run"
@@ -12,7 +12,7 @@
     "@asyncapi/bundler": "^0.3.8",
     "@asyncapi/converter": "^1.3.1",
     "@asyncapi/diff": "^0.4.1",
-    "@asyncapi/generator": "^1.13.0",
+    "@asyncapi/generator": "^1.13.1",
     "@asyncapi/modelina": "^1.9.0",
     "@asyncapi/openapi-schema-parser": "^3.0.3",
     "@asyncapi/optimizer": "^0.2.1",
@@ -23,7 +23,7 @@
     "@oclif/core": "^1.26.2",
     "@oclif/errors": "^1.3.6",
     "@oclif/plugin-not-found": "^2.3.22",
-    "@smoya/multi-parser": "^3.0.0",
+    "@smoya/multi-parser": "^4.0.0",
     "@stoplight/spectral-cli": "6.9.0",
     "ajv": "^8.12.0",
     "chalk": "^4.1.0",
diff --git a/src/commands/generate/models.ts b/src/commands/generate/models.ts
index 211b5ed8054..e75a0e1de23 100644
--- a/src/commands/generate/models.ts
+++ b/src/commands/generate/models.ts
@@ -164,9 +164,9 @@ export default class Models extends Command {
     }
     
     // Modelina, atm, is not using @asyncapi/parser@v3.x but @asyncapi/parser@v2.x, so it still uses Parser-API v1.0.0. 
-    // This call converts the parsed document object using @asyncapi/parser@v3.x (Parser-API v2.0.0) to a document compatible with the Parser-API version in use in @asyncapi/parser@v2.x  (v1.0.0)
+    // This call converts the parsed document object using @asyncapi/parser@v3.x (Parser-API v2) to a document compatible with the Parser-API version in use in @asyncapi/parser@v2.x  (v1)
     // This is needed until https://github.com/asyncapi/modelina/issues/1493 gets fixed.
-    const convertedDoc = ConvertDocumentParserAPIVersion(document.json(), '1.0.0');
+    const convertedDoc = ConvertDocumentParserAPIVersion(document.json(), 1);
 
     Logger.setLogger({
       info: (message) => {