diff --git a/CHANGELOG.md b/CHANGELOG.md
index 082545b89..46564a97f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,5 @@
 # Changelog
 
-## [Upcoming](https://github.com/reimagined/resolve/tree/HEAD)
-
-[Full Changelog](https://github.com/reimagined/resolve/compare/V0.33.5...HEAD)
-
-**Other changes:**
-
-- Mark read model adapters operations [\#2166](https://github.com/reimagined/resolve/pull/2166)
-
 ## [V0.33.5](https://github.com/reimagined/resolve/tree/V0.33.5) (2021-12-02)
 
 [Full Changelog](https://github.com/reimagined/resolve/compare/V0.33.4...V0.33.5)
diff --git a/examples/js/hacker-news/package.json b/examples/js/hacker-news/package.json
index 6bab8b92d..f23f97a30 100644
--- a/examples/js/hacker-news/package.json
+++ b/examples/js/hacker-news/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hacker-news-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "Hacker News application clone with CQRS and EventSourcing",
   "scripts": {
@@ -27,23 +27,23 @@
   },
   "dependencies": {
     "@elastic/elasticsearch": "7.11.0",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/module-auth": "0.33.5",
-    "@resolve-js/module-comments": "0.33.5",
-    "@resolve-js/module-replication": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/redux": "0.33.5",
-    "@resolve-js/replicator-via-api-handler": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/module-auth": "0.33.6",
+    "@resolve-js/module-comments": "0.33.6",
+    "@resolve-js/module-replication": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/redux": "0.33.6",
+    "@resolve-js/replicator-via-api-handler": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "isomorphic-fetch": "3.0.0",
     "js-cookie": "2.2.1",
@@ -76,7 +76,7 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/examples/js/personal-data/package.json b/examples/js/personal-data/package.json
index 3b3afde03..08e02a274 100644
--- a/examples/js/personal-data/package.json
+++ b/examples/js/personal-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "personal-data-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "personal user data within events (GDPR compliance)",
   "scripts": {
@@ -16,18 +16,18 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-auth": "0.33.5",
-    "@resolve-js/module-uploader": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-auth": "0.33.6",
+    "@resolve-js/module-uploader": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "babel-loader": "8.2.2",
     "crypto-js": "4.0.0",
     "generate-password": "1.6.0",
@@ -55,8 +55,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/examples/js/shopping-list-redux-hoc/package.json b/examples/js/shopping-list-redux-hoc/package.json
index 9acd75598..3e16bc1d7 100644
--- a/examples/js/shopping-list-redux-hoc/package.json
+++ b/examples/js/shopping-list-redux-hoc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shopping-list-redux-hoc-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with read-models and view-models",
   "scripts": {
@@ -18,17 +18,17 @@
     "@types/react": "17.0.5"
   },
   "dependencies": {
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/redux": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/redux": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "isomorphic-fetch": "3.0.0",
     "jsonwebtoken": "8.5.1",
@@ -55,8 +55,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/examples/js/shopping-list-redux/package.json b/examples/js/shopping-list-redux/package.json
index 78d179d8d..7d0890a29 100644
--- a/examples/js/shopping-list-redux/package.json
+++ b/examples/js/shopping-list-redux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shopping-list-redux-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with read-models and view-models using redux hooks",
   "scripts": {
@@ -18,17 +18,17 @@
     "@types/react": "17.0.5"
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/redux": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/redux": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "isomorphic-fetch": "3.0.0",
     "jsonwebtoken": "8.5.1",
@@ -55,8 +55,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/examples/js/shopping-list/package.json b/examples/js/shopping-list/package.json
index 0bfc5da7c..04722a132 100644
--- a/examples/js/shopping-list/package.json
+++ b/examples/js/shopping-list/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shopping-list-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with read-models and view-models",
   "scripts": {
@@ -18,16 +18,16 @@
     "@types/react": "17.0.5"
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "isomorphic-fetch": "3.0.0",
     "react": "17.0.2",
@@ -49,8 +49,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/examples/ts/hacker-news/package.json b/examples/ts/hacker-news/package.json
index 890f4b65b..fa29c6e20 100644
--- a/examples/ts/hacker-news/package.json
+++ b/examples/ts/hacker-news/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hacker-news-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "Hacker News application clone with CQRS and EventSourcing",
   "scripts": {
@@ -27,23 +27,23 @@
   },
   "dependencies": {
     "@elastic/elasticsearch": "7.11.0",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/module-auth": "0.33.5",
-    "@resolve-js/module-comments": "0.33.5",
-    "@resolve-js/module-replication": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/redux": "0.33.5",
-    "@resolve-js/replicator-via-api-handler": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/module-auth": "0.33.6",
+    "@resolve-js/module-comments": "0.33.6",
+    "@resolve-js/module-replication": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/redux": "0.33.6",
+    "@resolve-js/replicator-via-api-handler": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "isomorphic-fetch": "3.0.0",
     "js-cookie": "2.2.1",
@@ -76,7 +76,7 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
     "@types/isomorphic-fetch": "0.0.35",
     "@types/jest": "26.0.23",
     "@types/jsonwebtoken": "8.5.4",
diff --git a/examples/ts/personal-data/package.json b/examples/ts/personal-data/package.json
index c2fa0788b..b8d2d858f 100644
--- a/examples/ts/personal-data/package.json
+++ b/examples/ts/personal-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "personal-data-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "personal user data within events (GDPR compliance)",
   "scripts": {
@@ -16,18 +16,18 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-auth": "0.33.5",
-    "@resolve-js/module-uploader": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-auth": "0.33.6",
+    "@resolve-js/module-uploader": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "babel-loader": "8.2.2",
     "crypto-js": "4.0.0",
     "generate-password": "1.6.0",
@@ -55,8 +55,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "@types/crypto-js": "4.0.2",
     "@types/jest": "26.0.23",
     "@types/node": "14.17.5",
diff --git a/examples/ts/shopping-list-redux-hoc/package.json b/examples/ts/shopping-list-redux-hoc/package.json
index 100b21408..c03719833 100644
--- a/examples/ts/shopping-list-redux-hoc/package.json
+++ b/examples/ts/shopping-list-redux-hoc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shopping-list-redux-hoc-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with read-models and view-models",
   "scripts": {
@@ -18,17 +18,17 @@
     "@types/react": "17.0.5"
   },
   "dependencies": {
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/redux": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/redux": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "isomorphic-fetch": "3.0.0",
     "jsonwebtoken": "8.5.1",
@@ -55,8 +55,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "@types/jest": "26.0.23",
     "@types/node": "14.17.5",
     "@types/react": "17.0.5",
diff --git a/examples/ts/shopping-list-redux/package.json b/examples/ts/shopping-list-redux/package.json
index 2bec3c814..60d5108b9 100644
--- a/examples/ts/shopping-list-redux/package.json
+++ b/examples/ts/shopping-list-redux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shopping-list-redux-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with read-models and view-models using redux hooks",
   "scripts": {
@@ -18,17 +18,17 @@
     "@types/react": "17.0.5"
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/redux": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/redux": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "isomorphic-fetch": "3.0.0",
     "jsonwebtoken": "8.5.1",
@@ -55,8 +55,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "@types/jest": "26.0.23",
     "@types/node": "14.17.5",
     "@types/react": "17.0.5",
diff --git a/examples/ts/shopping-list/package.json b/examples/ts/shopping-list/package.json
index 237fab2f9..60aa94b95 100644
--- a/examples/ts/shopping-list/package.json
+++ b/examples/ts/shopping-list/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shopping-list-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with read-models and view-models",
   "scripts": {
@@ -18,16 +18,16 @@
     "@types/react": "17.0.5"
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "isomorphic-fetch": "3.0.0",
     "react": "17.0.2",
@@ -49,8 +49,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "@types/jest": "26.0.23",
     "@types/node": "14.17.5",
     "@types/react": "17.0.5",
diff --git a/functional-tests/app/package.json b/functional-tests/app/package.json
index d904c2267..1634864fc 100644
--- a/functional-tests/app/package.json
+++ b/functional-tests/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used to perform various functional test",
   "scripts": {
@@ -11,18 +11,18 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/module-uploader": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/redux": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/module-uploader": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/redux": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "crypto-js": "4.0.0",
     "generate-password": "1.6.0",
     "history": "4.10.1",
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-runtime": "7.14.3",
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/functional-tests/package.json b/functional-tests/package.json
index aab5e9897..73353fcdd 100644
--- a/functional-tests/package.json
+++ b/functional-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "functional-tests",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "scripts": {
     "cleanup": "ts-node --files=true scripts/run.ts clean",
@@ -12,8 +12,8 @@
     "@babel/core": "7.14.3",
     "@babel/node": "7.14.2",
     "@babel/preset-env": "7.14.4",
-    "@internal/helpers": "0.33.5",
-    "@resolve-js/client": "0.33.5",
+    "@internal/helpers": "0.33.6",
+    "@resolve-js/client": "0.33.6",
     "babel-jest": "27.0.2",
     "commander": "6.1.0",
     "consola": "2.15.3",
diff --git a/internal/babel-compile/package.json b/internal/babel-compile/package.json
index c4533cb2c..9f0e4e008 100644
--- a/internal/babel-compile/package.json
+++ b/internal/babel-compile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/babel-compile",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "bin": "./bin/index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/cli": "7.16.0",
-    "@internal/helpers": "0.33.5",
+    "@internal/helpers": "0.33.6",
     "chalk": "4.1.0",
     "glob": "7.1.6",
     "minimist": "1.2.5",
diff --git a/internal/build-packages/package.json b/internal/build-packages/package.json
index 6766e65b6..bf76479ce 100644
--- a/internal/build-packages/package.json
+++ b/internal/build-packages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/build-packages",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "bin": "./bin/index.js",
   "scripts": {
@@ -8,6 +8,6 @@
     "test": "echo || exit 0"
   },
   "dependencies": {
-    "@internal/helpers": "0.33.5"
+    "@internal/helpers": "0.33.6"
   }
 }
diff --git a/internal/cra-test/package.json b/internal/cra-test/package.json
index 403000259..c73832b48 100644
--- a/internal/cra-test/package.json
+++ b/internal/cra-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/cra-test",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "bin": "./bin/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "test": "echo || exit 0"
   },
   "dependencies": {
-    "@internal/helpers": "0.33.5",
+    "@internal/helpers": "0.33.6",
     "consola": "^2.15.3",
     "minimist": "1.2.5",
     "rimraf": "3.0.2"
diff --git a/internal/helpers/package.json b/internal/helpers/package.json
index 263b4da4e..d08f71c50 100644
--- a/internal/helpers/package.json
+++ b/internal/helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/helpers",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "main": "index.js",
   "bin": "./bin/index.js",
diff --git a/internal/local-registry/package.json b/internal/local-registry/package.json
index 7346a939f..4938a7c16 100644
--- a/internal/local-registry/package.json
+++ b/internal/local-registry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/local-registry",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "bin": "./bin/index.js",
   "scripts": {
@@ -8,6 +8,6 @@
     "test": "echo || exit 0"
   },
   "dependencies": {
-    "@internal/helpers": "0.33.5"
+    "@internal/helpers": "0.33.6"
   }
 }
diff --git a/internal/root-yarn/package.json b/internal/root-yarn/package.json
index dbb32bf15..163e2e97e 100644
--- a/internal/root-yarn/package.json
+++ b/internal/root-yarn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/root-yarn",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "bin": "./bin/index.js",
   "scripts": {
@@ -8,6 +8,6 @@
     "test": "echo || exit 0"
   },
   "dependencies": {
-    "@internal/helpers": "0.33.5"
+    "@internal/helpers": "0.33.6"
   }
 }
diff --git a/internal/use-local-registry/package.json b/internal/use-local-registry/package.json
index f4342105c..31f0d8d7b 100644
--- a/internal/use-local-registry/package.json
+++ b/internal/use-local-registry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/use-local-registry",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "main": "./index.js",
   "bin": "./bin/index.js",
@@ -9,8 +9,8 @@
     "test": "echo || exit 0"
   },
   "dependencies": {
-    "@internal/helpers": "0.33.5",
-    "@internal/local-registry": "0.33.5",
+    "@internal/helpers": "0.33.6",
+    "@internal/local-registry": "0.33.6",
     "minimist": "1.2.5"
   }
 }
diff --git a/internal/workspaces/package.json b/internal/workspaces/package.json
index 08be08549..0b4ddb838 100644
--- a/internal/workspaces/package.json
+++ b/internal/workspaces/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/workspaces",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "bin": "./bin/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "test": "echo || exit 0"
   },
   "dependencies": {
-    "@internal/helpers": "0.33.5",
+    "@internal/helpers": "0.33.6",
     "chalk": "4.0.0",
     "micromatch": "4.0.4",
     "minimist": "1.2.5",
diff --git a/package.json b/package.json
index 33f0bfc6a..7c8602681 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/resolve",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "repository": "https://github.com/reimagined/resolve.git",
   "license": "MIT",
@@ -62,7 +62,7 @@
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
     "@babel/runtime": "7.14.0",
-    "@internal/helpers": "0.33.5",
+    "@internal/helpers": "0.33.6",
     "@testing-library/dom": "7.30.0",
     "@typescript-eslint/eslint-plugin": "4.27.0",
     "@typescript-eslint/parser": "4.27.0",
diff --git a/packages/core/client/package.json b/packages/core/client/package.json
index cf6477844..928b6175d 100644
--- a/packages/core/client/package.json
+++ b/packages/core/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/client",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "Basic reSolve client.",
   "keywords": [
     "cqrs",
@@ -39,7 +39,7 @@
     "verbose": true
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
+    "@resolve-js/core": "0.33.6",
     "global": "4.4.0",
     "isomorphic-fetch": "3.0.0",
     "node-fetch": "2.6.1",
diff --git a/packages/core/core/package.json b/packages/core/core/package.json
index 6a4173e9a..66e053522 100644
--- a/packages/core/core/package.json
+++ b/packages/core/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/core",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "reSolve core.",
   "keywords": [
     "cqrs",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/debug-levels": "0.33.5",
+    "@resolve-js/debug-levels": "0.33.6",
     "uuid": "8.3.2"
   },
   "devDependencies": {
diff --git a/packages/core/create-resolve-app/package.json b/packages/core/create-resolve-app/package.json
index 35c5f866f..e22b10fd0 100644
--- a/packages/core/create-resolve-app/package.json
+++ b/packages/core/create-resolve-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-resolve-app",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A tool that generates boilerplate web applications based on the reSolve framework",
   "keywords": [
     "cqrs",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/debug-levels": "0.33.5",
+    "@resolve-js/debug-levels": "0.33.6",
     "adm-zip": "0.5.4",
     "boxen": "5.0.0",
     "chalk": "4.1.0",
diff --git a/packages/core/debug-levels/package.json b/packages/core/debug-levels/package.json
index 256b348f9..bde2a8574 100644
--- a/packages/core/debug-levels/package.json
+++ b/packages/core/debug-levels/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/debug-levels",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "Provides the debug-level API for reSolve packages.",
   "keywords": [
     "cqrs",
diff --git a/packages/core/react-hooks/package.json b/packages/core/react-hooks/package.json
index 95f2c9bc6..f8b80a80c 100644
--- a/packages/core/react-hooks/package.json
+++ b/packages/core/react-hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/react-hooks",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "reSolve client wrapper for using in React hooks projects.",
   "keywords": [
     "cqrs",
@@ -38,8 +38,8 @@
     "verbose": true
   },
   "dependencies": {
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5"
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "5.11.9",
diff --git a/packages/core/redux/package.json b/packages/core/redux/package.json
index e14b91bea..62c576d1f 100644
--- a/packages/core/redux/package.json
+++ b/packages/core/redux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/redux",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "Provides tools that you can use to connect a React/Redux frontend to reSolve.",
   "keywords": [
     "cqrs",
@@ -38,9 +38,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
     "hoist-non-react-statics": "3.3.2",
     "json-stable-stringify": "1.0.1",
     "jwt-decode": "3.1.2",
diff --git a/packages/modules/module-admin/package.json b/packages/modules/module-admin/package.json
index 4466ffec5..173e33cf3 100644
--- a/packages/modules/module-admin/package.json
+++ b/packages/modules/module-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/module-admin",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A reSolve module that adds admin commands to an application.",
   "keywords": [
     "cqrs",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/eventstore-base": "0.33.5",
+    "@resolve-js/eventstore-base": "0.33.6",
     "columnify": "1.5.4",
     "dateformat": "4.5.1",
     "isomorphic-fetch": "3.0.0",
diff --git a/packages/modules/module-auth/package.json b/packages/modules/module-auth/package.json
index 3fc0ced9d..c0b25d2a2 100644
--- a/packages/modules/module-auth/package.json
+++ b/packages/modules/module-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/module-auth",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A reSolve module that adds authentication to an application.",
   "keywords": [
     "cqrs",
diff --git a/packages/modules/module-comments/package.json b/packages/modules/module-comments/package.json
index 643c100b0..6b7b1df87 100644
--- a/packages/modules/module-comments/package.json
+++ b/packages/modules/module-comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/module-comments",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A reSolve module that allows an application's users to post comments.",
   "keywords": [
     "cqrs",
@@ -26,14 +26,14 @@
     "@babel/runtime": "7.14.0"
   },
   "devDependencies": {
-    "@resolve-js/redux": "0.33.5",
+    "@resolve-js/redux": "0.33.6",
     "jest": "27.0.3",
     "react": "17.0.2",
     "react-redux": "7.2.4",
     "redux": "4.1.0"
   },
   "peerDependencies": {
-    "@resolve-js/redux": "0.33.5",
+    "@resolve-js/redux": "0.33.6",
     "react": "^17.0.1",
     "react-redux": "^7.2.2",
     "redux": "^4.0.5"
diff --git a/packages/modules/module-replication/package.json b/packages/modules/module-replication/package.json
index 259e58685..e1258ea9b 100644
--- a/packages/modules/module-replication/package.json
+++ b/packages/modules/module-replication/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/module-replication",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A reSolve module that adds replication commands to an application.",
   "keywords": [
     "cqrs",
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
diff --git a/packages/modules/module-uploader/package.json b/packages/modules/module-uploader/package.json
index 27db8a318..029bb61b7 100644
--- a/packages/modules/module-uploader/package.json
+++ b/packages/modules/module-uploader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/module-uploader",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A reSolve module that adds uploader commands to an application.",
   "keywords": [
     "cqrs",
diff --git a/packages/runtime/adapters/eventstore-adapters/eventstore-base/package.json b/packages/runtime/adapters/eventstore-adapters/eventstore-base/package.json
index a581cf52c..1ba681fec 100644
--- a/packages/runtime/adapters/eventstore-adapters/eventstore-base/package.json
+++ b/packages/runtime/adapters/eventstore-adapters/eventstore-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/eventstore-base",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A base for reSolve eventstore adapters",
   "keywords": [
     "cqrs",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
     "fp-ts": "2.9.5",
     "io-ts": "2.2.16",
     "io-ts-types": "0.5.15",
diff --git a/packages/runtime/adapters/eventstore-adapters/eventstore-lite/package.json b/packages/runtime/adapters/eventstore-adapters/eventstore-lite/package.json
index cdd6f6869..6db39a11f 100644
--- a/packages/runtime/adapters/eventstore-adapters/eventstore-lite/package.json
+++ b/packages/runtime/adapters/eventstore-adapters/eventstore-lite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/eventstore-lite",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "An adapter reSolve uses to store events in a file or memory.",
   "keywords": [
     "cqrs",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
     "@types/better-sqlite3": "7.4.0",
     "better-sqlite3": "7.4.3",
     "crc-32": "^1.2.0",
diff --git a/packages/runtime/adapters/eventstore-adapters/eventstore-mysql/package.json b/packages/runtime/adapters/eventstore-adapters/eventstore-mysql/package.json
index a41b56b5c..79341be3d 100644
--- a/packages/runtime/adapters/eventstore-adapters/eventstore-mysql/package.json
+++ b/packages/runtime/adapters/eventstore-adapters/eventstore-mysql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/eventstore-mysql",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "An adapter reSolve uses to store events in MySQL.",
   "keywords": [
     "cqrs",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
     "mysql2": "2.1.0"
   },
   "devDependencies": {
diff --git a/packages/runtime/adapters/eventstore-adapters/eventstore-postgresql/package.json b/packages/runtime/adapters/eventstore-adapters/eventstore-postgresql/package.json
index be331d594..3d6ea61f8 100644
--- a/packages/runtime/adapters/eventstore-adapters/eventstore-postgresql/package.json
+++ b/packages/runtime/adapters/eventstore-adapters/eventstore-postgresql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/eventstore-postgresql",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "An adapter reSolve uses to store events in PostgreSQL.",
   "keywords": [
     "cqrs",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
     "crc-32": "^1.2.0",
     "pg": "8.5.1",
     "pg-cursor": "2.7.1"
diff --git a/packages/runtime/adapters/monitoring-adapters/monitoring-aws-cloudwatch/package.json b/packages/runtime/adapters/monitoring-adapters/monitoring-aws-cloudwatch/package.json
index 1f303c5ba..46faa2954 100644
--- a/packages/runtime/adapters/monitoring-adapters/monitoring-aws-cloudwatch/package.json
+++ b/packages/runtime/adapters/monitoring-adapters/monitoring-aws-cloudwatch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/monitoring-aws-cloudwatch",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "This package serves as a monitoring adapter used to store monitoring data in AWS CloudWatch",
   "keywords": [
     "cqrs",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/monitoring-base": "0.33.5",
-    "@resolve-js/runtime-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/monitoring-base": "0.33.6",
+    "@resolve-js/runtime-base": "0.33.6",
     "resolve-cloud-common": "0.0.149"
   },
   "devDependencies": {
diff --git a/packages/runtime/adapters/monitoring-adapters/monitoring-base/package.json b/packages/runtime/adapters/monitoring-adapters/monitoring-base/package.json
index 5c832674f..3e63ef589 100644
--- a/packages/runtime/adapters/monitoring-adapters/monitoring-base/package.json
+++ b/packages/runtime/adapters/monitoring-adapters/monitoring-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/monitoring-base",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "This package is the base for reSolve monitoring adapters",
   "keywords": [
     "cqrs",
@@ -24,8 +24,8 @@
     "testw": "jest --config=../../../../../jest.config.js --watchAll"
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5"
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6"
   },
   "devDependencies": {
     "jest": "27.0.3",
diff --git a/packages/runtime/adapters/monitoring-adapters/monitoring-console/package.json b/packages/runtime/adapters/monitoring-adapters/monitoring-console/package.json
index d439b724f..cb3b8f58a 100644
--- a/packages/runtime/adapters/monitoring-adapters/monitoring-console/package.json
+++ b/packages/runtime/adapters/monitoring-adapters/monitoring-console/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/monitoring-console",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "This package serves as a monitoring adapter used to print monitoring metrics to the text console",
   "keywords": [
     "cqrs",
@@ -24,9 +24,9 @@
     "testw": "jest --config=../../../../../jest.config.js --watchAll"
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/monitoring-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/monitoring-base": "0.33.6",
     "columnify": "1.5.4"
   },
   "devDependencies": {
diff --git a/packages/runtime/adapters/readmodel-adapters/readmodel-base/package.json b/packages/runtime/adapters/readmodel-adapters/readmodel-base/package.json
index 3df37baab..7acb2b2f3 100644
--- a/packages/runtime/adapters/readmodel-adapters/readmodel-base/package.json
+++ b/packages/runtime/adapters/readmodel-adapters/readmodel-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/readmodel-base",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A base package for reSolve read model adapters",
   "keywords": [
     "cqrs",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
     "path-toolkit": "1.2.1",
     "uuid": "8.3.2"
   },
diff --git a/packages/runtime/adapters/readmodel-adapters/readmodel-lite/package.json b/packages/runtime/adapters/readmodel-adapters/readmodel-lite/package.json
index 1d27971ac..46901ee06 100644
--- a/packages/runtime/adapters/readmodel-adapters/readmodel-lite/package.json
+++ b/packages/runtime/adapters/readmodel-adapters/readmodel-lite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/readmodel-lite",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "An adapter the resolve-query uses to store the read model state in memory",
   "keywords": [
     "cqrs",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/readmodel-base": "0.33.5",
+    "@resolve-js/readmodel-base": "0.33.6",
     "@types/better-sqlite3": "7.4.0",
     "better-sqlite3": "7.4.3",
     "tmp": "0.2.1",
diff --git a/packages/runtime/adapters/readmodel-adapters/readmodel-mysql/package.json b/packages/runtime/adapters/readmodel-adapters/readmodel-mysql/package.json
index 714f0e9ef..41bd6b9f6 100644
--- a/packages/runtime/adapters/readmodel-adapters/readmodel-mysql/package.json
+++ b/packages/runtime/adapters/readmodel-adapters/readmodel-mysql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/readmodel-mysql",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "An adapter the resolve-query uses to store the read model state in MySQL",
   "keywords": [
     "cqrs",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/readmodel-base": "0.33.5",
+    "@resolve-js/readmodel-base": "0.33.6",
     "mysql2": "2.2.5",
     "uuid": "8.3.2"
   },
diff --git a/packages/runtime/adapters/readmodel-adapters/readmodel-postgresql/package.json b/packages/runtime/adapters/readmodel-adapters/readmodel-postgresql/package.json
index a1b1acb2a..5d9e8d273 100644
--- a/packages/runtime/adapters/readmodel-adapters/readmodel-postgresql/package.json
+++ b/packages/runtime/adapters/readmodel-adapters/readmodel-postgresql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/readmodel-postgresql",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "This package serves as a resolve-query adapter for storing a read model in postgres",
   "keywords": [
     "cqrs",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
     "pg": "8.5.1"
   },
   "devDependencies": {
diff --git a/packages/runtime/adapters/replicators/replicator-via-api-handler/package.json b/packages/runtime/adapters/replicators/replicator-via-api-handler/package.json
index 7f710af52..7f18cc997 100644
--- a/packages/runtime/adapters/replicators/replicator-via-api-handler/package.json
+++ b/packages/runtime/adapters/replicators/replicator-via-api-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/replicator-via-api-handler",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "A base package for reSolve read model adapters",
   "keywords": [
     "cqrs",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@babel/runtime": "7.9.6",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
-    "@resolve-js/module-replication": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
+    "@resolve-js/module-replication": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
     "node-fetch": "2.6.1"
   },
   "devDependencies": {
diff --git a/packages/runtime/runtimes/runtime-aws-serverless/package.json b/packages/runtime/runtimes/runtime-aws-serverless/package.json
index ade40ab7d..d0e8933bd 100644
--- a/packages/runtime/runtimes/runtime-aws-serverless/package.json
+++ b/packages/runtime/runtimes/runtime-aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/runtime-aws-serverless",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "The reSolve framework's AWS runtime based on serverless services.",
   "keywords": [
     "cqrs",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
-    "@resolve-js/monitoring-aws-cloudwatch": "0.33.5",
-    "@resolve-js/runtime-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
+    "@resolve-js/monitoring-aws-cloudwatch": "0.33.6",
+    "@resolve-js/runtime-base": "0.33.6",
     "binary-case": "1.1.4",
     "content-disposition": "0.5.3",
     "cookie": "0.4.1",
diff --git a/packages/runtime/runtimes/runtime-base/package.json b/packages/runtime/runtimes/runtime-base/package.json
index fdb9df4b4..859d1942e 100644
--- a/packages/runtime/runtimes/runtime-base/package.json
+++ b/packages/runtime/runtimes/runtime-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/runtime-base",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "The reSolve framework's runtimes base interfaces.",
   "keywords": [
     "cqrs",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
     "content-disposition": "0.5.3",
     "file-type": "16.5.3",
     "http-status-codes": "2.1.4",
diff --git a/packages/runtime/runtimes/runtime-single-process/package.json b/packages/runtime/runtimes/runtime-single-process/package.json
index 5a07f3ebc..f756d0b11 100644
--- a/packages/runtime/runtimes/runtime-single-process/package.json
+++ b/packages/runtime/runtimes/runtime-single-process/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/runtime-single-process",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "The reSolve framework's single NodeJS process runtime.",
   "keywords": [
     "cqrs",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
-    "@resolve-js/runtime-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
+    "@resolve-js/runtime-base": "0.33.6",
     "content-disposition": "0.5.3",
     "cookie": "0.4.1",
     "express": "4.17.1",
diff --git a/packages/tools/scripts/package.json b/packages/tools/scripts/package.json
index ff4dce98f..13f15b938 100644
--- a/packages/tools/scripts/package.json
+++ b/packages/tools/scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/scripts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "Contains scripts used to initialize a reSolve server.",
   "keywords": [
     "cqrs",
@@ -33,11 +33,11 @@
     "@babel/register": "7.13.16",
     "@babel/runtime": "7.14.0",
     "@purtuga/esm-webpack-plugin": "1.5.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-base": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-base": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "address": "1.1.2",
     "ajv": "7.2.1",
     "babel-loader": "8.2.2",
diff --git a/packages/tools/testing-tools/package.json b/packages/tools/testing-tools/package.json
index 1fd87d823..644d66eec 100644
--- a/packages/tools/testing-tools/package.json
+++ b/packages/tools/testing-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@resolve-js/testing-tools",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "description": "Tools used to test reSolve applications.",
   "keywords": [
     "cqrs",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/runtime-base": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/runtime-base": "0.33.6",
     "colors": "1.4.0",
     "diff": "5.0.0",
     "lodash.isequal": "4.5.0",
@@ -36,7 +36,7 @@
     "lodash.partial": "4.2.1"
   },
   "devDependencies": {
-    "@resolve-js/readmodel-lite": "0.33.5",
+    "@resolve-js/readmodel-lite": "0.33.6",
     "@types/diff": "5.0.0",
     "@types/lodash.isequal": "4.5.5",
     "@types/lodash.omit": "4.5.6",
diff --git a/templates/js/postcss/package.json b/templates/js/postcss/package.json
index 7ad5a0a0b..c96de7b1f 100644
--- a/templates/js/postcss/package.json
+++ b/templates/js/postcss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with postCSS",
   "scripts": {
@@ -15,12 +15,12 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
diff --git a/templates/js/react/package.json b/templates/js/react/package.json
index 2bbf3e897..808e507c7 100644
--- a/templates/js/react/package.json
+++ b/templates/js/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -15,15 +15,15 @@
     "@types/react": "17.0.5"
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
     "react-dom": "17.0.2",
@@ -40,8 +40,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/templates/js/styled-components/package.json b/templates/js/styled-components/package.json
index 9ef930c43..57b4cc2e2 100644
--- a/templates/js/styled-components/package.json
+++ b/templates/js/styled-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "styled-components-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with Styled Components",
   "scripts": {
@@ -15,12 +15,12 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
diff --git a/templates/js/vanilla/package.json b/templates/js/vanilla/package.json
index 00d4fdac9..fed45669c 100644
--- a/templates/js/vanilla/package.json
+++ b/templates/js/vanilla/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vanilla-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-base": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-base": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "domready": "1.0.8",
     "unfetch": "4.2.0"
   },
diff --git a/templates/js/vue/package.json b/templates/js/vue/package.json
index 26c287b3b..68bfe486e 100644
--- a/templates/js/vue/package.json
+++ b/templates/js/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-js",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "Example shows how to work with Vue framework",
   "scripts": {
@@ -13,12 +13,12 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "bootstrap": "4.6.0",
     "bootstrap-vue": "2.21.2",
     "copy-webpack-plugin": "6.0.0",
diff --git a/templates/ts/angular/package.json b/templates/ts/angular/package.json
index fba57c7ac..9d7b4a966 100644
--- a/templates/ts/angular/package.json
+++ b/templates/ts/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "Example shows how to work with Angular-8 framework",
   "scripts": {
@@ -21,14 +21,14 @@
     "@angular/platform-browser-dynamic": "11.2.4",
     "@babel/node": "7.14.2",
     "@ngtools/webpack": "11.2.3",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "angular-router-loader": "0.8.5",
     "angular2-template-loader": "0.6.2",
     "awesome-typescript-loader": "5.2.1",
diff --git a/templates/ts/postcss/package.json b/templates/ts/postcss/package.json
index 4a414e13f..aff69a63e 100644
--- a/templates/ts/postcss/package.json
+++ b/templates/ts/postcss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with postCSS",
   "scripts": {
@@ -15,12 +15,12 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
diff --git a/templates/ts/react/package.json b/templates/ts/react/package.json
index 1fd4dc845..9002d8988 100644
--- a/templates/ts/react/package.json
+++ b/templates/ts/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -15,15 +15,15 @@
     "@types/react": "17.0.5"
   },
   "dependencies": {
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-base": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-base": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
     "react-dom": "17.0.2",
@@ -40,8 +40,8 @@
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.14.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "@types/jest": "26.0.23",
     "@types/node": "14.17.5",
     "@types/react": "17.0.5",
diff --git a/templates/ts/styled-components/package.json b/templates/ts/styled-components/package.json
index db99de396..4d1ad7046 100644
--- a/templates/ts/styled-components/package.json
+++ b/templates/ts/styled-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "styled-components-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "shows how to work with Styled Components",
   "scripts": {
@@ -15,12 +15,12 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
diff --git a/templates/ts/vanilla/package.json b/templates/ts/vanilla/package.json
index 4b0bea17b..95422f41a 100644
--- a/templates/ts/vanilla/package.json
+++ b/templates/ts/vanilla/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vanilla-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-base": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-base": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "domready": "1.0.8",
     "unfetch": "4.2.0"
   },
diff --git a/templates/ts/vue/package.json b/templates/ts/vue/package.json
index c216123a4..728946f92 100644
--- a/templates/ts/vue/package.json
+++ b/templates/ts/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-ts",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "Example shows how to work with Vue framework",
   "scripts": {
@@ -13,12 +13,12 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/client": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/client": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
     "bootstrap": "4.6.0",
     "bootstrap-vue": "2.21.2",
     "copy-webpack-plugin": "6.0.0",
diff --git a/tests/package.json b/tests/package.json
index cf5ed4697..b217aeb8c 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tests",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "API tests for resolve",
   "scripts": {
@@ -27,16 +27,16 @@
   },
   "devDependencies": {
     "@babel/runtime": "7.14.0",
-    "@resolve-js/core": "0.33.5",
-    "@resolve-js/debug-levels": "0.33.5",
-    "@resolve-js/eventstore-base": "0.33.5",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-mysql": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/scripts": "0.33.5",
-    "@resolve-js/testing-tools": "0.33.5",
+    "@resolve-js/core": "0.33.6",
+    "@resolve-js/debug-levels": "0.33.6",
+    "@resolve-js/eventstore-base": "0.33.6",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-mysql": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/scripts": "0.33.6",
+    "@resolve-js/testing-tools": "0.33.6",
     "jest": "27.0.3",
     "jsonwebtoken": "8.5.1",
     "pg": "8.5.1",
diff --git a/tutorial/lesson-1/package.json b/tutorial/lesson-1/package.json
index ca71886e5..cd4f980e3 100644
--- a/tutorial/lesson-1/package.json
+++ b/tutorial/lesson-1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopping-list-tutorial/lesson-7",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -15,14 +15,14 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
@@ -43,7 +43,7 @@
     "@babel/plugin-transform-runtime": "7.14.3",
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/tutorial/lesson-2/package.json b/tutorial/lesson-2/package.json
index ece83c962..494cc7924 100644
--- a/tutorial/lesson-2/package.json
+++ b/tutorial/lesson-2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopping-list-tutorial/lesson-2",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -15,14 +15,14 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
@@ -42,7 +42,7 @@
     "@babel/plugin-transform-runtime": "7.14.3",
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/tutorial/lesson-3/package.json b/tutorial/lesson-3/package.json
index ad91f0a7e..8da9aee23 100644
--- a/tutorial/lesson-3/package.json
+++ b/tutorial/lesson-3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopping-list-tutorial/lesson-3",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -15,14 +15,14 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
@@ -43,7 +43,7 @@
     "@babel/plugin-transform-runtime": "7.14.3",
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/tutorial/lesson-4/package.json b/tutorial/lesson-4/package.json
index d8199c960..e7561b457 100644
--- a/tutorial/lesson-4/package.json
+++ b/tutorial/lesson-4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopping-list-tutorial/lesson-4",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -16,14 +16,14 @@
   "dependencies": {
     "@babel/node": "7.8.7",
     "@babel/polyfill": "7.8.7",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
@@ -44,7 +44,7 @@
     "@babel/plugin-transform-runtime": "7.14.3",
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/tutorial/lesson-5/package.json b/tutorial/lesson-5/package.json
index 273b94509..7403a18d9 100644
--- a/tutorial/lesson-5/package.json
+++ b/tutorial/lesson-5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopping-list-tutorial/lesson-5",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "description": "used as a template for new reSolve applications",
   "scripts": {
@@ -15,14 +15,14 @@
   },
   "dependencies": {
     "@babel/node": "7.14.2",
-    "@resolve-js/eventstore-lite": "0.33.5",
-    "@resolve-js/eventstore-postgresql": "0.33.5",
-    "@resolve-js/module-admin": "0.33.5",
-    "@resolve-js/react-hooks": "0.33.5",
-    "@resolve-js/readmodel-lite": "0.33.5",
-    "@resolve-js/readmodel-postgresql": "0.33.5",
-    "@resolve-js/runtime-aws-serverless": "0.33.5",
-    "@resolve-js/runtime-single-process": "0.33.5",
+    "@resolve-js/eventstore-lite": "0.33.6",
+    "@resolve-js/eventstore-postgresql": "0.33.6",
+    "@resolve-js/module-admin": "0.33.6",
+    "@resolve-js/react-hooks": "0.33.6",
+    "@resolve-js/readmodel-lite": "0.33.6",
+    "@resolve-js/readmodel-postgresql": "0.33.6",
+    "@resolve-js/runtime-aws-serverless": "0.33.6",
+    "@resolve-js/runtime-single-process": "0.33.6",
     "history": "4.10.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.0",
@@ -44,7 +44,7 @@
     "@babel/plugin-transform-runtime": "7.14.3",
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
-    "@resolve-js/scripts": "0.33.5",
+    "@resolve-js/scripts": "0.33.6",
     "aws-sdk": "2.860.0",
     "aws-xray-sdk-core": "3.2.0",
     "babel-jest": "27.0.2",
diff --git a/website/package.json b/website/package.json
index 18f139efb..f77e44103 100644
--- a/website/package.json
+++ b/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "website",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "private": true,
   "scripts": {
     "build": "docusaurus build",