diff --git a/apps/studio/package.json b/apps/studio/package.json
index e64d4088a..f6e41e9ae 100644
--- a/apps/studio/package.json
+++ b/apps/studio/package.json
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "@asyncapi/dotnet-nats-template": "^0.12.1",
-    "@asyncapi/go-watermill-template": "^0.2.70",
+    "@asyncapi/go-watermill-template": "^0.2.71",
     "@asyncapi/html-template": "^2.1.7",
     "@asyncapi/java-spring-cloud-stream-template": "^0.13.4",
     "@asyncapi/java-spring-template": "^1.5.1",
diff --git a/package-lock.json b/package-lock.json
index 7729f7b75..00cb89062 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -528,7 +528,7 @@
       },
       "devDependencies": {
         "@asyncapi/dotnet-nats-template": "^0.12.1",
-        "@asyncapi/go-watermill-template": "^0.2.70",
+        "@asyncapi/go-watermill-template": "^0.2.71",
         "@asyncapi/html-template": "^2.1.7",
         "@asyncapi/java-spring-cloud-stream-template": "^0.13.4",
         "@asyncapi/java-spring-template": "^1.5.1",
@@ -1319,15 +1319,15 @@
       }
     },
     "node_modules/@asyncapi/go-watermill-template": {
-      "version": "0.2.70",
-      "resolved": "https://registry.npmjs.org/@asyncapi/go-watermill-template/-/go-watermill-template-0.2.70.tgz",
-      "integrity": "sha512-V2ZheZx7znK2eIEjdJbEX8JJTS1dMbv4NHfUNRiFybTUNpcvrzgJNYtWbZAhsaSqkQRPBWZ0o0+HdQe39AEKTg==",
+      "version": "0.2.71",
+      "resolved": "https://registry.npmjs.org/@asyncapi/go-watermill-template/-/go-watermill-template-0.2.71.tgz",
+      "integrity": "sha512-RoxOnlmHRCJtbMZAShXu5a3GUOQd5QCvRs09UKw7IO0sNKT6XBkQOQlLct7KVYIwwpqMIJL5YDfGZ9YeM1MNSA==",
       "dev": true,
       "dependencies": {
         "@asyncapi/generator-filters": "^2.0.0",
         "@asyncapi/generator-hooks": "^0.1.0",
         "@asyncapi/generator-react-sdk": "^0.2.23",
-        "@asyncapi/modelina": "^3.4.3"
+        "@asyncapi/modelina": "^3.4.4"
       }
     },
     "node_modules/@asyncapi/go-watermill-template/node_modules/@apidevtools/json-schema-ref-parser": {
@@ -1348,14 +1348,14 @@
       }
     },
     "node_modules/@asyncapi/go-watermill-template/node_modules/@asyncapi/modelina": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-3.4.3.tgz",
-      "integrity": "sha512-1Xhwa26tyADlOH5CosmfQhrlAurrCYzwud932d8wQCxPfVzezu0B9JkMLWqBnzv7w2DAYug+Uni4VqXo/+KYvA==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-3.4.4.tgz",
+      "integrity": "sha512-j+FaempXX8BElM9UFSLAOLi2b3lxDxUgmXY1GrX2iJ00wLKIcHys+SJCo5h3JkgZxv1xit4MrrpDnoDNrahsow==",
       "dev": true,
       "dependencies": {
         "@apidevtools/json-schema-ref-parser": "^11.1.0",
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@asyncapi/parser": "^3.0.8",
+        "@asyncapi/parser": "^3.0.9",
         "@smoya/multi-parser": "^5.0.1",
         "@swc/core": "^1.3.5",
         "@swc/jest": "^0.2.23",
@@ -1371,12 +1371,12 @@
       }
     },
     "node_modules/@asyncapi/go-watermill-template/node_modules/@asyncapi/parser": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.8.tgz",
-      "integrity": "sha512-BdH+Or1MjZdoBotz1DkwY6aW3CPWA5fcFMAngmBkviIHhmZqZBn7hA55WQ5YeYbRytct/o2ATtVI/pHbU/wPGg==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.10.tgz",
+      "integrity": "sha512-x9qo7SHGzPWbC1XCRyilcI+Z6UZsWZ9uRl05h9j4G/v+3IjNG3krwngiAbt59nbLlYZD/nBS7Hc03GayoocnQw==",
       "dev": true,
       "dependencies": {
-        "@asyncapi/specs": "^6.5.1",
+        "@asyncapi/specs": "^6.5.3",
         "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0",
         "@stoplight/json": "^3.20.2",
         "@stoplight/json-ref-readers": "^1.2.2",
@@ -1398,9 +1398,9 @@
       }
     },
     "node_modules/@asyncapi/go-watermill-template/node_modules/@asyncapi/specs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.1.tgz",
-      "integrity": "sha512-T7pOyVt7jo3VV3dPVvWwGYde/09WyFa0Qpq8Yjj06UNWJoXACftsdRF/pK0qLtjC0NAB8YV0AlDvxASYiwXq3g==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz",
+      "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.11"
@@ -26927,9 +26927,9 @@
       }
     },
     "node_modules/parserapiv2/node_modules/@asyncapi/specs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.1.tgz",
-      "integrity": "sha512-T7pOyVt7jo3VV3dPVvWwGYde/09WyFa0Qpq8Yjj06UNWJoXACftsdRF/pK0qLtjC0NAB8YV0AlDvxASYiwXq3g==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz",
+      "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.11"
@@ -26957,12 +26957,12 @@
     },
     "node_modules/parserapiv3": {
       "name": "@asyncapi/parser",
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.8.tgz",
-      "integrity": "sha512-BdH+Or1MjZdoBotz1DkwY6aW3CPWA5fcFMAngmBkviIHhmZqZBn7hA55WQ5YeYbRytct/o2ATtVI/pHbU/wPGg==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.10.tgz",
+      "integrity": "sha512-x9qo7SHGzPWbC1XCRyilcI+Z6UZsWZ9uRl05h9j4G/v+3IjNG3krwngiAbt59nbLlYZD/nBS7Hc03GayoocnQw==",
       "dev": true,
       "dependencies": {
-        "@asyncapi/specs": "^6.5.1",
+        "@asyncapi/specs": "^6.5.3",
         "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0",
         "@stoplight/json": "^3.20.2",
         "@stoplight/json-ref-readers": "^1.2.2",
@@ -26984,9 +26984,9 @@
       }
     },
     "node_modules/parserapiv3/node_modules/@asyncapi/specs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.1.tgz",
-      "integrity": "sha512-T7pOyVt7jo3VV3dPVvWwGYde/09WyFa0Qpq8Yjj06UNWJoXACftsdRF/pK0qLtjC0NAB8YV0AlDvxASYiwXq3g==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz",
+      "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.11"
@@ -35743,15 +35743,15 @@
       }
     },
     "@asyncapi/go-watermill-template": {
-      "version": "0.2.70",
-      "resolved": "https://registry.npmjs.org/@asyncapi/go-watermill-template/-/go-watermill-template-0.2.70.tgz",
-      "integrity": "sha512-V2ZheZx7znK2eIEjdJbEX8JJTS1dMbv4NHfUNRiFybTUNpcvrzgJNYtWbZAhsaSqkQRPBWZ0o0+HdQe39AEKTg==",
+      "version": "0.2.71",
+      "resolved": "https://registry.npmjs.org/@asyncapi/go-watermill-template/-/go-watermill-template-0.2.71.tgz",
+      "integrity": "sha512-RoxOnlmHRCJtbMZAShXu5a3GUOQd5QCvRs09UKw7IO0sNKT6XBkQOQlLct7KVYIwwpqMIJL5YDfGZ9YeM1MNSA==",
       "dev": true,
       "requires": {
         "@asyncapi/generator-filters": "^2.0.0",
         "@asyncapi/generator-hooks": "^0.1.0",
         "@asyncapi/generator-react-sdk": "^0.2.23",
-        "@asyncapi/modelina": "^3.4.3"
+        "@asyncapi/modelina": "^3.4.4"
       },
       "dependencies": {
         "@apidevtools/json-schema-ref-parser": {
@@ -35766,14 +35766,14 @@
           }
         },
         "@asyncapi/modelina": {
-          "version": "3.4.3",
-          "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-3.4.3.tgz",
-          "integrity": "sha512-1Xhwa26tyADlOH5CosmfQhrlAurrCYzwud932d8wQCxPfVzezu0B9JkMLWqBnzv7w2DAYug+Uni4VqXo/+KYvA==",
+          "version": "3.4.4",
+          "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-3.4.4.tgz",
+          "integrity": "sha512-j+FaempXX8BElM9UFSLAOLi2b3lxDxUgmXY1GrX2iJ00wLKIcHys+SJCo5h3JkgZxv1xit4MrrpDnoDNrahsow==",
           "dev": true,
           "requires": {
             "@apidevtools/json-schema-ref-parser": "^11.1.0",
             "@apidevtools/swagger-parser": "^10.1.0",
-            "@asyncapi/parser": "^3.0.8",
+            "@asyncapi/parser": "^3.0.9",
             "@smoya/multi-parser": "^5.0.1",
             "@swc/core": "^1.3.5",
             "@swc/jest": "^0.2.23",
@@ -35786,12 +35786,12 @@
           }
         },
         "@asyncapi/parser": {
-          "version": "3.0.8",
-          "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.8.tgz",
-          "integrity": "sha512-BdH+Or1MjZdoBotz1DkwY6aW3CPWA5fcFMAngmBkviIHhmZqZBn7hA55WQ5YeYbRytct/o2ATtVI/pHbU/wPGg==",
+          "version": "3.0.10",
+          "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.10.tgz",
+          "integrity": "sha512-x9qo7SHGzPWbC1XCRyilcI+Z6UZsWZ9uRl05h9j4G/v+3IjNG3krwngiAbt59nbLlYZD/nBS7Hc03GayoocnQw==",
           "dev": true,
           "requires": {
-            "@asyncapi/specs": "^6.5.1",
+            "@asyncapi/specs": "^6.5.3",
             "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0",
             "@stoplight/json": "^3.20.2",
             "@stoplight/json-ref-readers": "^1.2.2",
@@ -35813,9 +35813,9 @@
           }
         },
         "@asyncapi/specs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.1.tgz",
-          "integrity": "sha512-T7pOyVt7jo3VV3dPVvWwGYde/09WyFa0Qpq8Yjj06UNWJoXACftsdRF/pK0qLtjC0NAB8YV0AlDvxASYiwXq3g==",
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz",
+          "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.11"
@@ -36545,7 +36545,7 @@
         "@asyncapi/avro-schema-parser": "^3.0.15",
         "@asyncapi/converter": "^1.4.13",
         "@asyncapi/dotnet-nats-template": "^0.12.1",
-        "@asyncapi/go-watermill-template": "^0.2.70",
+        "@asyncapi/go-watermill-template": "^0.2.71",
         "@asyncapi/html-template": "^2.1.7",
         "@asyncapi/java-spring-cloud-stream-template": "^0.13.4",
         "@asyncapi/java-spring-template": "^1.5.1",
@@ -53110,9 +53110,9 @@
       },
       "dependencies": {
         "@asyncapi/specs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.1.tgz",
-          "integrity": "sha512-T7pOyVt7jo3VV3dPVvWwGYde/09WyFa0Qpq8Yjj06UNWJoXACftsdRF/pK0qLtjC0NAB8YV0AlDvxASYiwXq3g==",
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz",
+          "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.11"
@@ -53130,12 +53130,12 @@
       }
     },
     "parserapiv3": {
-      "version": "npm:@asyncapi/parser@3.0.8",
-      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.8.tgz",
-      "integrity": "sha512-BdH+Or1MjZdoBotz1DkwY6aW3CPWA5fcFMAngmBkviIHhmZqZBn7hA55WQ5YeYbRytct/o2ATtVI/pHbU/wPGg==",
+      "version": "npm:@asyncapi/parser@3.0.10",
+      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.10.tgz",
+      "integrity": "sha512-x9qo7SHGzPWbC1XCRyilcI+Z6UZsWZ9uRl05h9j4G/v+3IjNG3krwngiAbt59nbLlYZD/nBS7Hc03GayoocnQw==",
       "dev": true,
       "requires": {
-        "@asyncapi/specs": "^6.5.1",
+        "@asyncapi/specs": "^6.5.3",
         "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0",
         "@stoplight/json": "^3.20.2",
         "@stoplight/json-ref-readers": "^1.2.2",
@@ -53157,9 +53157,9 @@
       },
       "dependencies": {
         "@asyncapi/specs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.1.tgz",
-          "integrity": "sha512-T7pOyVt7jo3VV3dPVvWwGYde/09WyFa0Qpq8Yjj06UNWJoXACftsdRF/pK0qLtjC0NAB8YV0AlDvxASYiwXq3g==",
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz",
+          "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.11"