diff --git a/VERSION b/VERSION
index 5c4503b704..564edf82dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.49.0
+0.50.0
diff --git a/WORKSPACE b/WORKSPACE
index 22130018c4..81de75c22e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -10,9 +10,9 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "com_github_airyhq_bazel_tools",
-    commit = "f33ecc4e2e3349f7f7634bb8491b2e431dd41fa6",
+    commit = "f499013901107a0462e7fbe6043b84b8cd260e3a",
     remote = "https://github.com/airyhq/bazel-tools.git",
-    shallow_since = "1660918023 +0200",
+    shallow_since = "1664876567 +0200",
 )
 
 load("@com_github_airyhq_bazel_tools//:repositories.bzl", "airy_bazel_tools_dependencies", "airy_jvm_deps")
diff --git a/backend/components/admin/BUILD b/backend/components/admin/BUILD
index 38e9acc358..815eee69fb 100644
--- a/backend/components/admin/BUILD
+++ b/backend/components/admin/BUILD
@@ -36,7 +36,7 @@ springboot(
 
 custom_java_library(
     name = "test-util",
-    srcs = ["src/test/java/co/airy/core/api/admin/util/Topics.java"],
+    srcs = ["src/test/java/co/airy/core/admin/util/Topics.java"],
     deps = app_deps,
 )
 
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/ChannelsController.java b/backend/components/admin/src/main/java/co/airy/core/admin/ChannelsController.java
similarity index 98%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/ChannelsController.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/ChannelsController.java
index de3d28edf7..62e3f1b821 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/ChannelsController.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/ChannelsController.java
@@ -1,9 +1,9 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
 import co.airy.avro.communication.Metadata;
-import co.airy.core.api.admin.payload.ChannelsResponsePayload;
+import co.airy.core.admin.payload.ChannelsResponsePayload;
 import co.airy.model.channel.ChannelPayload;
 import co.airy.model.channel.dto.ChannelContainer;
 import co.airy.model.metadata.MetadataKeys;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/Stores.java b/backend/components/admin/src/main/java/co/airy/core/admin/Stores.java
similarity index 90%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/Stores.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/Stores.java
index df3b8f734a..2525dee6b4 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/Stores.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/Stores.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
@@ -39,7 +39,7 @@
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
-import static co.airy.core.api.admin.TimestampExtractor.timestampExtractor;
+import static co.airy.core.admin.TimestampExtractor.timestampExtractor;
 import static co.airy.model.metadata.MetadataRepository.getId;
 import static co.airy.model.metadata.MetadataRepository.getSubject;
 
@@ -189,19 +189,21 @@ public Template getTemplate(String templateId) {
     public List<ChannelContainer> getChannels() {
         final ReadOnlyKeyValueStore<String, ChannelContainer> store = getConnectedChannelsStore();
 
-        final KeyValueIterator<String, ChannelContainer> iterator = store.all();
-
-        List<ChannelContainer> channels = new ArrayList<>();
-        iterator.forEachRemaining(kv -> channels.add(kv.value));
+        List<ChannelContainer> channels;
+        try (KeyValueIterator<String, ChannelContainer> iterator = store.all()) {
+            channels = new ArrayList<>();
+            iterator.forEachRemaining(kv -> channels.add(kv.value));
+        }
 
         return channels;
     }
 
     public List<Template> getTemplates() {
-        final KeyValueIterator<String, Template> iterator = getTemplatesStore().all();
-
-        List<Template> templates = new ArrayList<>();
-        iterator.forEachRemaining(kv -> templates.add(kv.value));
+        List<Template> templates;
+        try (KeyValueIterator<String, Template> iterator = getTemplatesStore().all()) {
+            templates = new ArrayList<>();
+            iterator.forEachRemaining(kv -> templates.add(kv.value));
+        }
 
         return templates;
     }
@@ -212,16 +214,20 @@ public Webhook getWebhook(String webhookId) {
     }
 
     public List<Webhook> getWebhooks() {
-        final KeyValueIterator<String, Webhook> iterator = getWebhookStore().all();
-        List<Webhook> webhooks = new ArrayList<>();
-        iterator.forEachRemaining(kv -> webhooks.add(kv.value));
+        List<Webhook> webhooks;
+        try (KeyValueIterator<String, Webhook> iterator = getWebhookStore().all()) {
+            webhooks = new ArrayList<>();
+            iterator.forEachRemaining(kv -> webhooks.add(kv.value));
+        }
         return webhooks;
     }
 
     public List<User> getUsers() {
-        final KeyValueIterator<String, User> iterator = getUsersStore().all();
-        List<User> users = new ArrayList<>();
-        iterator.forEachRemaining(kv -> users.add(kv.value));
+        List<User> users;
+        try (KeyValueIterator<String, User> iterator = getUsersStore().all()) {
+            users = new ArrayList<>();
+            iterator.forEachRemaining(kv -> users.add(kv.value));
+        }
         return users;
     }
 
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/TagsController.java b/backend/components/admin/src/main/java/co/airy/core/admin/TagsController.java
similarity index 89%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/TagsController.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/TagsController.java
index 27aa2f120e..8448b7438e 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/TagsController.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/TagsController.java
@@ -1,12 +1,12 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
 import co.airy.avro.communication.Tag;
 import co.airy.avro.communication.TagColor;
-import co.airy.core.api.admin.payload.CreateTagRequestPayload;
-import co.airy.core.api.admin.payload.DeleteTagRequestPayload;
-import co.airy.core.api.admin.payload.ListTagsResponsePayload;
+import co.airy.core.admin.payload.CreateTagRequestPayload;
+import co.airy.core.admin.payload.DeleteTagRequestPayload;
+import co.airy.core.admin.payload.ListTagsResponsePayload;
 import co.airy.core.api.admin.payload.TagPayload;
-import co.airy.core.api.admin.payload.UpdateTagRequestPayload;
+import co.airy.core.admin.payload.UpdateTagRequestPayload;
 import co.airy.spring.web.payload.RequestErrorResponsePayload;
 import org.apache.kafka.streams.state.KeyValueIterator;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
@@ -68,10 +68,11 @@ ResponseEntity<?> createTag(@RequestBody @Valid CreateTagRequestPayload payload)
     @PostMapping("/tags.list")
     ResponseEntity<ListTagsResponsePayload> listTags() {
         final ReadOnlyKeyValueStore<String, Tag> store = stores.getTagsStore();
-        final KeyValueIterator<String, Tag> iterator = store.all();
-
-        List<Tag> tags = new ArrayList<>();
-        iterator.forEachRemaining(kv -> tags.add(kv.value));
+        List<Tag> tags;
+        try (KeyValueIterator<String, Tag> iterator = store.all()) {
+            tags = new ArrayList<>();
+            iterator.forEachRemaining(kv -> tags.add(kv.value));
+        }
 
         final List<TagPayload> data = tags.stream().map(TagPayload::fromTag).collect(toList());
 
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/TemplatesController.java b/backend/components/admin/src/main/java/co/airy/core/admin/TemplatesController.java
similarity index 90%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/TemplatesController.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/TemplatesController.java
index 79410ed5bb..d79eb5eff0 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/TemplatesController.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/TemplatesController.java
@@ -1,12 +1,12 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
 import co.airy.avro.communication.Template;
-import co.airy.core.api.admin.payload.CreateTemplateRequestPayload;
-import co.airy.core.api.admin.payload.DeleteTemplateRequestPayload;
-import co.airy.core.api.admin.payload.GetTemplateRequestPayload;
-import co.airy.core.api.admin.payload.ListTemplatesRequestPayload;
-import co.airy.core.api.admin.payload.TemplatesResponsePayload;
-import co.airy.core.api.admin.payload.UpdateTemplateRequestPayload;
+import co.airy.core.admin.payload.CreateTemplateRequestPayload;
+import co.airy.core.admin.payload.DeleteTemplateRequestPayload;
+import co.airy.core.admin.payload.GetTemplateRequestPayload;
+import co.airy.core.admin.payload.ListTemplatesRequestPayload;
+import co.airy.core.admin.payload.TemplatesResponsePayload;
+import co.airy.core.admin.payload.UpdateTemplateRequestPayload;
 import co.airy.model.template.TemplatePayload;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/TimestampExtractor.java b/backend/components/admin/src/main/java/co/airy/core/admin/TimestampExtractor.java
similarity index 93%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/TimestampExtractor.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/TimestampExtractor.java
index 6e8e6dd732..58b03a2c17 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/TimestampExtractor.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/TimestampExtractor.java
@@ -1,7 +1,7 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
 import co.airy.avro.ops.HttpLog;
-import co.airy.core.api.admin.dto.LogWithTimestamp;
+import co.airy.core.admin.dto.LogWithTimestamp;
 import org.apache.kafka.streams.KeyValue;
 import org.apache.kafka.streams.kstream.Transformer;
 import org.apache.kafka.streams.kstream.TransformerSupplier;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/UsersController.java b/backend/components/admin/src/main/java/co/airy/core/admin/UsersController.java
similarity index 84%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/UsersController.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/UsersController.java
index ad31b14051..8193acd2aa 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/UsersController.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/UsersController.java
@@ -1,10 +1,10 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
 import co.airy.avro.communication.User;
-import co.airy.core.api.admin.payload.ListUsersResponsePayload;
-import co.airy.core.api.admin.payload.PaginationData;
-import co.airy.core.api.admin.payload.UserResponsePayload;
-import co.airy.core.api.admin.payload.UsersListRequestPayload;
+import co.airy.core.admin.payload.ListUsersResponsePayload;
+import co.airy.core.admin.payload.PaginationData;
+import co.airy.core.admin.payload.UserResponsePayload;
+import co.airy.core.admin.payload.UsersListRequestPayload;
 import co.airy.pagination.Page;
 import co.airy.pagination.Paginator;
 import org.springframework.http.ResponseEntity;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/WebhooksController.java b/backend/components/admin/src/main/java/co/airy/core/admin/WebhooksController.java
similarity index 93%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/WebhooksController.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/WebhooksController.java
index 280303aa4f..007518ca57 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/WebhooksController.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/WebhooksController.java
@@ -1,10 +1,16 @@
-package co.airy.core.api.admin;
-
+package co.airy.core.admin;
+
+import co.airy.core.admin.payload.WebhookInfoRequestPayload;
+import co.airy.core.admin.payload.WebhookListPayload;
+import co.airy.core.admin.payload.WebhookListResponsePayload;
+import co.airy.core.admin.payload.WebhookResponsePayload;
+import co.airy.core.admin.payload.WebhookSubscribePayload;
+import co.airy.core.admin.payload.WebhookUnsubscribePayload;
+import co.airy.core.admin.payload.WebhookUpdatePayload;
 import co.airy.avro.communication.Status;
 import co.airy.avro.communication.Webhook;
-import co.airy.core.api.admin.payload.*;
-import co.airy.core.api.config.ServiceDiscovery;
-import co.airy.core.api.config.dto.ComponentInfo;
+import co.airy.core.config.ServiceDiscovery;
+import co.airy.core.config.dto.ComponentInfo;
 import co.airy.model.event.payload.EventType;
 import co.airy.spring.web.payload.RequestErrorResponsePayload;
 import org.springframework.http.HttpStatus;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/dto/LogWithTimestamp.java b/backend/components/admin/src/main/java/co/airy/core/admin/dto/LogWithTimestamp.java
similarity index 89%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/dto/LogWithTimestamp.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/dto/LogWithTimestamp.java
index 08581f0253..fd948ecf1f 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/dto/LogWithTimestamp.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/dto/LogWithTimestamp.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.dto;
+package co.airy.core.admin.dto;
 
 import co.airy.avro.ops.HttpLog;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ChannelsResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/ChannelsResponsePayload.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ChannelsResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/ChannelsResponsePayload.java
index 49903e25f4..bc7004aaea 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ChannelsResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/ChannelsResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import co.airy.model.channel.ChannelPayload;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/CreateTagRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/CreateTagRequestPayload.java
similarity index 88%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/CreateTagRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/CreateTagRequestPayload.java
index 305f148aae..93d2269aef 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/CreateTagRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/CreateTagRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/CreateTemplateRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/CreateTemplateRequestPayload.java
similarity index 90%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/CreateTemplateRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/CreateTemplateRequestPayload.java
index edf2f177a2..fbd6e616d5 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/CreateTemplateRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/CreateTemplateRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/DeleteTagRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/DeleteTagRequestPayload.java
similarity index 88%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/DeleteTagRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/DeleteTagRequestPayload.java
index f1859adbe4..7df3b6d3e7 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/DeleteTagRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/DeleteTagRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/DeleteTemplateRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/DeleteTemplateRequestPayload.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/DeleteTemplateRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/DeleteTemplateRequestPayload.java
index 5135e53fe0..2f7a09af53 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/DeleteTemplateRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/DeleteTemplateRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/GetTemplateRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/GetTemplateRequestPayload.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/GetTemplateRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/GetTemplateRequestPayload.java
index 58409faafb..d8a9e07a4d 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/GetTemplateRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/GetTemplateRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListTagsResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/ListTagsResponsePayload.java
similarity index 75%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListTagsResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/ListTagsResponsePayload.java
index c04add3def..b29f476969 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListTagsResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/ListTagsResponsePayload.java
@@ -1,5 +1,6 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
+import co.airy.core.api.admin.payload.TagPayload;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListTemplatesRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/ListTemplatesRequestPayload.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListTemplatesRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/ListTemplatesRequestPayload.java
index 86f4f82836..141c358b64 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListTemplatesRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/ListTemplatesRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListUsersResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/ListUsersResponsePayload.java
similarity index 88%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListUsersResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/ListUsersResponsePayload.java
index d90dfb4f87..bad75aabbd 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/ListUsersResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/ListUsersResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/PaginationData.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/PaginationData.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/PaginationData.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/PaginationData.java
index fbc15579e3..b639fbe60a 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/PaginationData.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/PaginationData.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/TemplatesResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/TemplatesResponsePayload.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/TemplatesResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/TemplatesResponsePayload.java
index c01623585e..2188849586 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/TemplatesResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/TemplatesResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import co.airy.model.template.TemplatePayload;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UpdateTagRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/UpdateTagRequestPayload.java
similarity index 89%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UpdateTagRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/UpdateTagRequestPayload.java
index 0067210e30..c9e6fd8de3 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UpdateTagRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/UpdateTagRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UpdateTemplateRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/UpdateTemplateRequestPayload.java
similarity index 91%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UpdateTemplateRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/UpdateTemplateRequestPayload.java
index 6bdf678700..7007f7888d 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UpdateTemplateRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/UpdateTemplateRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UserResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/UserResponsePayload.java
similarity index 94%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UserResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/UserResponsePayload.java
index 651c274091..04542137e8 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UserResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/UserResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import co.airy.avro.communication.User;
 import lombok.Builder;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UsersListRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/UsersListRequestPayload.java
similarity index 85%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UsersListRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/UsersListRequestPayload.java
index 9d5b0728c9..15ecea89ae 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/UsersListRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/UsersListRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookInfoRequestPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookInfoRequestPayload.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookInfoRequestPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookInfoRequestPayload.java
index 04bf897fbb..609b1b4e08 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookInfoRequestPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookInfoRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListPayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookListPayload.java
similarity index 88%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListPayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookListPayload.java
index 1fd84d357d..1319065c1d 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListPayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookListPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookListResponsePayload.java
similarity index 85%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookListResponsePayload.java
index d32b7f5a0b..814b9d9fe9 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookListResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookResponsePayload.java
similarity index 88%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookResponsePayload.java
index b193752d39..499c77e88f 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscribePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookSubscribePayload.java
similarity index 94%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscribePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookSubscribePayload.java
index 5725eb2b1b..8a6413015e 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscribePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookSubscribePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import co.airy.model.event.payload.EventType;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUnsubscribePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookUnsubscribePayload.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUnsubscribePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookUnsubscribePayload.java
index 0abee3ef92..3f92f244c7 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUnsubscribePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookUnsubscribePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUpdatePayload.java b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookUpdatePayload.java
similarity index 94%
rename from backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUpdatePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookUpdatePayload.java
index f097932fef..69e357adb4 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUpdatePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/admin/payload/WebhookUpdatePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.payload;
+package co.airy.core.admin.payload;
 
 import co.airy.model.event.payload.EventType;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/config/ClientConfigController.java b/backend/components/admin/src/main/java/co/airy/core/config/ClientConfigController.java
similarity index 95%
rename from backend/components/admin/src/main/java/co/airy/core/api/config/ClientConfigController.java
rename to backend/components/admin/src/main/java/co/airy/core/config/ClientConfigController.java
index b88d17c816..a9fc956f65 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/config/ClientConfigController.java
+++ b/backend/components/admin/src/main/java/co/airy/core/config/ClientConfigController.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.config;
+package co.airy.core.config;
 
-import co.airy.core.api.config.payload.ClientConfigResponsePayload;
+import co.airy.core.config.payload.ClientConfigResponsePayload;
 import co.airy.spring.auth.PrincipalAccess;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/config/ClientControllerConfig.java b/backend/components/admin/src/main/java/co/airy/core/config/ClientControllerConfig.java
similarity index 92%
rename from backend/components/admin/src/main/java/co/airy/core/api/config/ClientControllerConfig.java
rename to backend/components/admin/src/main/java/co/airy/core/config/ClientControllerConfig.java
index c3f56961f1..e2b44d40bc 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/config/ClientControllerConfig.java
+++ b/backend/components/admin/src/main/java/co/airy/core/config/ClientControllerConfig.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.config;
+package co.airy.core.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/config/HealthApi.java b/backend/components/admin/src/main/java/co/airy/core/config/HealthApi.java
similarity index 98%
rename from backend/components/admin/src/main/java/co/airy/core/api/config/HealthApi.java
rename to backend/components/admin/src/main/java/co/airy/core/config/HealthApi.java
index 78ec26dc7c..1d7155a278 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/config/HealthApi.java
+++ b/backend/components/admin/src/main/java/co/airy/core/config/HealthApi.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.config;
+package co.airy.core.config;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/config/ServiceDiscovery.java b/backend/components/admin/src/main/java/co/airy/core/config/ServiceDiscovery.java
similarity index 93%
rename from backend/components/admin/src/main/java/co/airy/core/api/config/ServiceDiscovery.java
rename to backend/components/admin/src/main/java/co/airy/core/config/ServiceDiscovery.java
index 198f8db976..2725716f44 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/config/ServiceDiscovery.java
+++ b/backend/components/admin/src/main/java/co/airy/core/config/ServiceDiscovery.java
@@ -1,8 +1,8 @@
-package co.airy.core.api.config;
+package co.airy.core.config;
 
-import co.airy.core.api.config.dto.ComponentInfo;
-import co.airy.core.api.config.dto.ServiceInfo;
-import co.airy.core.api.config.payload.ServicesResponsePayload;
+import co.airy.core.config.dto.ComponentInfo;
+import co.airy.core.config.dto.ServiceInfo;
+import co.airy.core.config.payload.ServicesResponsePayload;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/config/dto/ComponentInfo.java b/backend/components/admin/src/main/java/co/airy/core/config/dto/ComponentInfo.java
similarity index 85%
rename from backend/components/admin/src/main/java/co/airy/core/api/config/dto/ComponentInfo.java
rename to backend/components/admin/src/main/java/co/airy/core/config/dto/ComponentInfo.java
index 0631cd9c7d..0fbeb2a15c 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/config/dto/ComponentInfo.java
+++ b/backend/components/admin/src/main/java/co/airy/core/config/dto/ComponentInfo.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.config.dto;
+package co.airy.core.config.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/config/dto/ServiceInfo.java b/backend/components/admin/src/main/java/co/airy/core/config/dto/ServiceInfo.java
similarity index 87%
rename from backend/components/admin/src/main/java/co/airy/core/api/config/dto/ServiceInfo.java
rename to backend/components/admin/src/main/java/co/airy/core/config/dto/ServiceInfo.java
index 2585bcc0b3..eba5579eea 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/config/dto/ServiceInfo.java
+++ b/backend/components/admin/src/main/java/co/airy/core/config/dto/ServiceInfo.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.config.dto;
+package co.airy.core.config.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/config/payload/ClientConfigResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/config/payload/ClientConfigResponsePayload.java
similarity index 84%
rename from backend/components/admin/src/main/java/co/airy/core/api/config/payload/ClientConfigResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/config/payload/ClientConfigResponsePayload.java
index f78216bee3..ca10e75bab 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/config/payload/ClientConfigResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/config/payload/ClientConfigResponsePayload.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.config.payload;
+package co.airy.core.config.payload;
 
-import co.airy.core.api.config.dto.ServiceInfo;
+import co.airy.core.config.dto.ServiceInfo;
 import co.airy.spring.auth.session.UserProfile;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/admin/src/main/java/co/airy/core/api/config/payload/ServicesResponsePayload.java b/backend/components/admin/src/main/java/co/airy/core/config/payload/ServicesResponsePayload.java
similarity index 78%
rename from backend/components/admin/src/main/java/co/airy/core/api/config/payload/ServicesResponsePayload.java
rename to backend/components/admin/src/main/java/co/airy/core/config/payload/ServicesResponsePayload.java
index 717214e0bd..95f699e24e 100644
--- a/backend/components/admin/src/main/java/co/airy/core/api/config/payload/ServicesResponsePayload.java
+++ b/backend/components/admin/src/main/java/co/airy/core/config/payload/ServicesResponsePayload.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.config.payload;
+package co.airy.core.config.payload;
 
-import co.airy.core.api.config.dto.ServiceInfo;
+import co.airy.core.config.dto.ServiceInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/backend/components/admin/src/test/java/co/airy/core/api/admin/ChannelsControllerTest.java b/backend/components/admin/src/test/java/co/airy/core/admin/ChannelsControllerTest.java
similarity index 98%
rename from backend/components/admin/src/test/java/co/airy/core/api/admin/ChannelsControllerTest.java
rename to backend/components/admin/src/test/java/co/airy/core/admin/ChannelsControllerTest.java
index 8561931043..3acec410c0 100644
--- a/backend/components/admin/src/test/java/co/airy/core/api/admin/ChannelsControllerTest.java
+++ b/backend/components/admin/src/test/java/co/airy/core/admin/ChannelsControllerTest.java
@@ -1,8 +1,8 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
-import co.airy.core.api.admin.util.Topics;
+import co.airy.core.admin.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.spring.core.AirySpringBootApplication;
diff --git a/backend/components/admin/src/test/java/co/airy/core/api/admin/TagsControllerTest.java b/backend/components/admin/src/test/java/co/airy/core/admin/TagsControllerTest.java
similarity index 98%
rename from backend/components/admin/src/test/java/co/airy/core/api/admin/TagsControllerTest.java
rename to backend/components/admin/src/test/java/co/airy/core/admin/TagsControllerTest.java
index 09e814e7a0..a667a7f570 100644
--- a/backend/components/admin/src/test/java/co/airy/core/api/admin/TagsControllerTest.java
+++ b/backend/components/admin/src/test/java/co/airy/core/admin/TagsControllerTest.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
-import co.airy.core.api.admin.util.Topics;
+import co.airy.core.admin.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.spring.core.AirySpringBootApplication;
diff --git a/backend/components/admin/src/test/java/co/airy/core/api/admin/TemplatesControllerTest.java b/backend/components/admin/src/test/java/co/airy/core/admin/TemplatesControllerTest.java
similarity index 98%
rename from backend/components/admin/src/test/java/co/airy/core/api/admin/TemplatesControllerTest.java
rename to backend/components/admin/src/test/java/co/airy/core/admin/TemplatesControllerTest.java
index 35ca5d2cc2..f1d5e5fa7a 100644
--- a/backend/components/admin/src/test/java/co/airy/core/api/admin/TemplatesControllerTest.java
+++ b/backend/components/admin/src/test/java/co/airy/core/admin/TemplatesControllerTest.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
-import co.airy.core.api.admin.util.Topics;
+import co.airy.core.admin.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.spring.core.AirySpringBootApplication;
diff --git a/backend/components/admin/src/test/java/co/airy/core/api/admin/UsersControllerTest.java b/backend/components/admin/src/test/java/co/airy/core/admin/UsersControllerTest.java
similarity index 96%
rename from backend/components/admin/src/test/java/co/airy/core/api/admin/UsersControllerTest.java
rename to backend/components/admin/src/test/java/co/airy/core/admin/UsersControllerTest.java
index be3e8fbf05..3202c289b8 100644
--- a/backend/components/admin/src/test/java/co/airy/core/api/admin/UsersControllerTest.java
+++ b/backend/components/admin/src/test/java/co/airy/core/admin/UsersControllerTest.java
@@ -1,9 +1,10 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
+import co.airy.core.admin.WebhooksController;
 import co.airy.avro.communication.User;
 import co.airy.avro.ops.HttpLog;
-import co.airy.core.api.admin.util.Topics;
-import co.airy.core.api.config.ServiceDiscovery;
+import co.airy.core.admin.util.Topics;
+import co.airy.core.config.ServiceDiscovery;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.spring.core.AirySpringBootApplication;
diff --git a/backend/components/admin/src/test/java/co/airy/core/api/admin/WebhooksControllerTest.java b/backend/components/admin/src/test/java/co/airy/core/admin/WebhooksControllerTest.java
similarity index 97%
rename from backend/components/admin/src/test/java/co/airy/core/api/admin/WebhooksControllerTest.java
rename to backend/components/admin/src/test/java/co/airy/core/admin/WebhooksControllerTest.java
index 84df53b169..c46d15a37d 100644
--- a/backend/components/admin/src/test/java/co/airy/core/api/admin/WebhooksControllerTest.java
+++ b/backend/components/admin/src/test/java/co/airy/core/admin/WebhooksControllerTest.java
@@ -1,10 +1,11 @@
-package co.airy.core.api.admin;
+package co.airy.core.admin;
 
+import co.airy.core.admin.WebhooksController;
 import co.airy.avro.communication.Status;
 import co.airy.avro.communication.Webhook;
-import co.airy.core.api.admin.util.Topics;
-import co.airy.core.api.config.ServiceDiscovery;
-import co.airy.core.api.config.dto.ServiceInfo;
+import co.airy.core.admin.util.Topics;
+import co.airy.core.config.ServiceDiscovery;
+import co.airy.core.config.dto.ServiceInfo;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.model.event.payload.EventType;
diff --git a/backend/components/admin/src/test/java/co/airy/core/api/admin/util/Topics.java b/backend/components/admin/src/test/java/co/airy/core/admin/util/Topics.java
similarity index 97%
rename from backend/components/admin/src/test/java/co/airy/core/api/admin/util/Topics.java
rename to backend/components/admin/src/test/java/co/airy/core/admin/util/Topics.java
index f1eec01a73..8df799de63 100644
--- a/backend/components/admin/src/test/java/co/airy/core/api/admin/util/Topics.java
+++ b/backend/components/admin/src/test/java/co/airy/core/admin/util/Topics.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.admin.util;
+package co.airy.core.admin.util;
 
 import co.airy.kafka.schema.Topic;
 import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
diff --git a/backend/components/admin/src/test/java/co/airy/core/api/config/ClientConfigControllerTest.java b/backend/components/admin/src/test/java/co/airy/core/config/ClientConfigControllerTest.java
similarity index 98%
rename from backend/components/admin/src/test/java/co/airy/core/api/config/ClientConfigControllerTest.java
rename to backend/components/admin/src/test/java/co/airy/core/config/ClientConfigControllerTest.java
index bd232e5aee..596112c8e8 100644
--- a/backend/components/admin/src/test/java/co/airy/core/api/config/ClientConfigControllerTest.java
+++ b/backend/components/admin/src/test/java/co/airy/core/config/ClientConfigControllerTest.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.config;
+package co.airy.core.config;
 
-import co.airy.core.api.admin.util.Topics;
+import co.airy.core.admin.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.spring.core.AirySpringBootApplication;
diff --git a/backend/components/communication/BUILD b/backend/components/communication/BUILD
index 3b477a673b..5f23b67437 100644
--- a/backend/components/communication/BUILD
+++ b/backend/components/communication/BUILD
@@ -37,7 +37,7 @@ springboot(
 
 java_library(
     name = "test-util",
-    srcs = glob(["src/test/java/co/airy/core/api/communication/util/**/*.java"]),
+    srcs = glob(["src/test/java/co/airy/core/communication/util/**/*.java"]),
     deps = [":app"] + app_deps,
 )
 
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/AsyncSendMessagesHandler.java b/backend/components/communication/src/main/java/co/airy/core/communication/AsyncSendMessagesHandler.java
similarity index 99%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/AsyncSendMessagesHandler.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/AsyncSendMessagesHandler.java
index 7c46d55229..747ba71ad0 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/AsyncSendMessagesHandler.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/AsyncSendMessagesHandler.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
@@ -46,7 +46,7 @@ private class PendingMessage {
     private final ConcurrentLinkedQueue<PendingMessage> pendingMessages;
     private final List<PendingMessage> pending;
     private final long maxWaitMillis;
-    
+
 
     AsyncSendMessagesHandler(
             Stores stores,
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/ConversationsController.java b/backend/components/communication/src/main/java/co/airy/core/communication/ConversationsController.java
similarity index 85%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/ConversationsController.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/ConversationsController.java
index 5006368c33..40bb8ee00e 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/ConversationsController.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/ConversationsController.java
@@ -1,21 +1,20 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Metadata;
 import co.airy.avro.communication.ReadReceipt;
 import co.airy.avro.communication.User;
-import co.airy.core.api.communication.dto.LuceneQueryResult;
-import co.airy.core.api.communication.lucene.AiryAnalyzer;
-import co.airy.core.api.communication.lucene.ExtendedQueryParser;
-import co.airy.core.api.communication.lucene.ReadOnlyLuceneStore;
-import co.airy.core.api.communication.payload.ConversationByIdRequestPayload;
-import co.airy.core.api.communication.payload.ConversationListRequestPayload;
-import co.airy.core.api.communication.payload.ConversationListResponsePayload;
-import co.airy.core.api.communication.payload.ConversationResponsePayload;
-import co.airy.core.api.communication.payload.ConversationSetStateRequestPayload;
-import co.airy.core.api.communication.payload.ConversationTagRequestPayload;
-import co.airy.core.api.communication.payload.ConversationUpdateContactRequestPayload;
-import co.airy.core.api.communication.payload.PaginationData;
-import co.airy.log.AiryLoggerFactory;
+import co.airy.core.communication.dto.LuceneQueryResult;
+import co.airy.core.communication.lucene.AiryAnalyzer;
+import co.airy.core.communication.lucene.ExtendedQueryParser;
+import co.airy.core.communication.lucene.ReadOnlyLuceneStore;
+import co.airy.core.communication.payload.ConversationByIdRequestPayload;
+import co.airy.core.communication.payload.ConversationListRequestPayload;
+import co.airy.core.communication.payload.ConversationListResponsePayload;
+import co.airy.core.communication.payload.ConversationResponsePayload;
+import co.airy.core.communication.payload.ConversationSetStateRequestPayload;
+import co.airy.core.communication.payload.ConversationTagRequestPayload;
+import co.airy.core.communication.payload.ConversationUpdateContactRequestPayload;
+import co.airy.core.communication.payload.PaginationData;
 import co.airy.model.conversation.Conversation;
 import co.airy.model.message.dto.MessageContainer;
 import co.airy.model.message.dto.Sender;
@@ -27,7 +26,6 @@
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
-import org.slf4j.Logger;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -144,30 +142,6 @@ ResponseEntity<?> conversationInfo(@RequestBody @Valid ConversationByIdRequestPa
         return ResponseEntity.ok(ConversationResponsePayload.fromConversation(conversation));
     }
 
-    @PostMapping({"/conversations.markRead", "/conversations.mark-read"})
-    ResponseEntity<?> conversationMarkRead(@RequestBody @Valid ConversationByIdRequestPayload payload) {
-        final ReadOnlyKeyValueStore<String, Conversation> store = stores.getConversationsStore();
-        final String conversationId = payload.getConversationId().toString();
-        final Conversation conversation = store.get(conversationId);
-
-        if (conversation == null) {
-            return ResponseEntity.notFound().build();
-        }
-
-        final ReadReceipt readReceipt = ReadReceipt.newBuilder()
-                .setConversationId(conversationId)
-                .setReadDate(Instant.now().toEpochMilli())
-                .build();
-
-        try {
-            stores.storeReadReceipt(readReceipt);
-        } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new RequestErrorResponsePayload(e.getMessage()));
-        }
-
-        return ResponseEntity.noContent().build();
-    }
-
     @PostMapping("/conversations.tag")
     ResponseEntity<?> conversationTag(@RequestBody @Valid ConversationTagRequestPayload payload) {
         final String conversationId = payload.getConversationId().toString();
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/MessagesController.java b/backend/components/communication/src/main/java/co/airy/core/communication/MessagesController.java
similarity index 92%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/MessagesController.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/MessagesController.java
index 8a4e32169e..14e0891b87 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/MessagesController.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/MessagesController.java
@@ -1,11 +1,11 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Metadata;
 import co.airy.avro.communication.ValueType;
-import co.airy.core.api.communication.payload.MessageListRequestPayload;
-import co.airy.core.api.communication.payload.MessageListResponsePayload;
-import co.airy.core.api.communication.payload.MessageSuggestRepliesRequestPayload;
-import co.airy.core.api.communication.payload.PaginationData;
+import co.airy.core.communication.payload.MessageListRequestPayload;
+import co.airy.core.communication.payload.MessageListResponsePayload;
+import co.airy.core.communication.payload.MessageSuggestRepliesRequestPayload;
+import co.airy.core.communication.payload.PaginationData;
 import co.airy.model.message.dto.MessageContainer;
 import co.airy.model.message.dto.MessageResponsePayload;
 import co.airy.pagination.Page;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/MetadataController.java b/backend/components/communication/src/main/java/co/airy/core/communication/MetadataController.java
similarity index 94%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/MetadataController.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/MetadataController.java
index 04f044239a..b05df4a8a8 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/MetadataController.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/MetadataController.java
@@ -1,7 +1,7 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Metadata;
-import co.airy.core.api.communication.payload.UpsertMetadataRequestPayload;
+import co.airy.core.communication.payload.UpsertMetadataRequestPayload;
 import co.airy.model.metadata.MetadataKeys;
 import co.airy.model.metadata.MetadataObjectMapper;
 import co.airy.model.metadata.Subject;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/SendMessageController.java b/backend/components/communication/src/main/java/co/airy/core/communication/SendMessageController.java
similarity index 96%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/SendMessageController.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/SendMessageController.java
index 2040759bf1..0e7d8c1343 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/SendMessageController.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/SendMessageController.java
@@ -1,11 +1,11 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
 import co.airy.avro.communication.DeliveryState;
 import co.airy.avro.communication.Message;
-import co.airy.core.api.communication.payload.ResendMessageRequestPayload;
-import co.airy.core.api.communication.payload.SendMessageRequestPayload;
+import co.airy.core.communication.payload.ResendMessageRequestPayload;
+import co.airy.core.communication.payload.SendMessageRequestPayload;
 import co.airy.model.conversation.Conversation;
 import co.airy.model.message.MessageRepository;
 import co.airy.model.message.dto.MessageContainer;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/Stores.java b/backend/components/communication/src/main/java/co/airy/core/communication/Stores.java
similarity index 82%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/Stores.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/Stores.java
index f7ad6e5849..9aef4b3127 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/Stores.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/Stores.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.Message;
@@ -6,13 +6,13 @@
 import co.airy.avro.communication.ReadReceipt;
 import co.airy.avro.communication.User;
 import co.airy.avro.communication.ValueType;
-import co.airy.core.api.communication.dto.CountAction;
-import co.airy.core.api.communication.dto.Messages;
-import co.airy.core.api.communication.dto.UnreadCountState;
-import co.airy.core.api.communication.lucene.IndexingProcessor;
-import co.airy.core.api.communication.lucene.LuceneDiskStore;
-import co.airy.core.api.communication.lucene.LuceneProvider;
-import co.airy.core.api.communication.lucene.ReadOnlyLuceneStore;
+import co.airy.core.communication.dto.CountAction;
+import co.airy.core.communication.dto.Messages;
+import co.airy.core.communication.dto.UnreadCountState;
+import co.airy.core.communication.lucene.IndexingProcessor;
+import co.airy.core.communication.lucene.LuceneDiskStore;
+import co.airy.core.communication.lucene.LuceneProvider;
+import co.airy.core.communication.lucene.ReadOnlyLuceneStore;
 import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
 import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
 import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
@@ -77,7 +77,6 @@ public class Stores implements HealthIndicator, ApplicationListener<ApplicationS
     private final String usersStore = "users-store";
     private final String applicationCommunicationMessages = new ApplicationCommunicationMessages().name();
     private final String applicationCommunicationMetadata = new ApplicationCommunicationMetadata().name();
-    private final String applicationCommunicationReadReceipts = new ApplicationCommunicationReadReceipts().name();
 
     Stores(KafkaStreamsWrapper streams,
            KafkaProducer<String, SpecificRecordBase> producer,
@@ -104,35 +103,6 @@ private void startStream() {
                 .groupBy((metadataId, metadata) -> KeyValue.pair(getSubject(metadata).getIdentifier(), metadata))
                 .aggregate(MetadataMap::new, MetadataMap::adder, MetadataMap::subtractor, Materialized.as(metadataStore));
 
-        final KStream<String, CountAction> resetStream = builder.<String, ReadReceipt>stream(applicationCommunicationReadReceipts)
-                .mapValues(readReceipt -> CountAction.reset(readReceipt.getReadDate()));
-
-        // produce unread count metadata
-        messageStream.filter((messageId, message) -> message != null && message.getIsFromContact())
-                .selectKey((messageId, message) -> message.getConversationId())
-                .mapValues(message -> CountAction.increment(message.getSentAt()))
-                .merge(resetStream)
-                .groupByKey()
-                .aggregate(UnreadCountState::new, (conversationId, countAction, unreadCountState) -> {
-                    if (countAction.getActionType().equals(CountAction.ActionType.INCREMENT)) {
-                        unreadCountState.getMessageSentDates().add(countAction.getReadDate());
-                    } else {
-                        unreadCountState.setMessageSentDates(
-                                unreadCountState.getMessageSentDates().stream()
-                                        .filter((timestamp) -> timestamp > countAction.getReadDate())
-                                        .collect(toCollection(HashSet::new)));
-                    }
-
-                    return unreadCountState;
-                }).toStream()
-                .map((conversationId, unreadCountState) -> {
-                    final Metadata metadata = newConversationMetadata(conversationId, MetadataKeys.ConversationKeys.UNREAD_COUNT,
-                            unreadCountState.getUnreadCount().toString());
-                    metadata.setValueType(ValueType.number);
-                    return KeyValue.pair(getId(metadata).toString(), metadata);
-                })
-                .to(applicationCommunicationMetadata);
-
         final KGroupedTable<String, MessageContainer> messageGroupedTable = messageStream.toTable()
                 .leftJoin(metadataTable, (message, metadataMap) -> MessageContainer.builder()
                         .message(message)
@@ -225,10 +195,6 @@ public ReadOnlyLuceneStore getConversationLuceneStore() {
         return luceneProvider;
     }
 
-    public void storeReadReceipt(ReadReceipt readReceipt) throws ExecutionException, InterruptedException {
-        producer.send(new ProducerRecord<>(applicationCommunicationReadReceipts, readReceipt.getConversationId(), readReceipt)).get();
-    }
-
     public void storeMessage(Message message) throws ExecutionException, InterruptedException {
         producer.send(new ProducerRecord<>(applicationCommunicationMessages, message.getId(), message)).get();
     }
@@ -298,15 +264,15 @@ public List<Conversation> enrichConversations(List<Conversation> conversations)
 
     public List<MessageContainer> getMessages(String conversationId) {
         final ReadOnlyKeyValueStore<String, Messages> store = getMessagesStore();
-        final Messages messagesTreeSet = store.get(conversationId);
+        final Messages messages = store.get(conversationId);
 
-        if (messagesTreeSet == null) {
+        if (messages == null) {
             return null;
         }
         // Enrich messages with user information
-        List<String> senderIds = messagesTreeSet.stream().map((container) -> container.getMessage().getSenderId()).collect(Collectors.toList());
+        List<String> senderIds = messages.stream().map((container) -> container.getMessage().getSenderId()).collect(Collectors.toList());
         Map<String, User> users = collectUsers(senderIds);
-        return messagesTreeSet.stream().peek((container) -> {
+        return messages.stream().peek((container) -> {
             final User user = users.get(container.getMessage().getSenderId());
 
             container.setSender(Sender.builder().id(container.getMessage().getSenderId())
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/ConversationIndex.java b/backend/components/communication/src/main/java/co/airy/core/communication/dto/ConversationIndex.java
similarity index 97%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/dto/ConversationIndex.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/dto/ConversationIndex.java
index 30360295ee..2deecbe26d 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/ConversationIndex.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/dto/ConversationIndex.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.dto;
+package co.airy.core.communication.dto;
 
 import co.airy.model.conversation.Conversation;
 import co.airy.model.metadata.dto.MetadataNode;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/CountAction.java b/backend/components/communication/src/main/java/co/airy/core/communication/dto/CountAction.java
similarity index 93%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/dto/CountAction.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/dto/CountAction.java
index 189cf0611d..8a0310d50f 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/CountAction.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/dto/CountAction.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.dto;
+package co.airy.core.communication.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/LuceneQueryResult.java b/backend/components/communication/src/main/java/co/airy/core/communication/dto/LuceneQueryResult.java
similarity index 83%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/dto/LuceneQueryResult.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/dto/LuceneQueryResult.java
index 13d34424ff..d61af0e873 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/LuceneQueryResult.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/dto/LuceneQueryResult.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.dto;
+package co.airy.core.communication.dto;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/Messages.java b/backend/components/communication/src/main/java/co/airy/core/communication/dto/Messages.java
similarity index 95%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/dto/Messages.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/dto/Messages.java
index f6120ef28b..78a32ab804 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/Messages.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/dto/Messages.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.dto;
+package co.airy.core.communication.dto;
 
 import co.airy.model.message.dto.MessageContainer;
 import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/UnreadCountState.java b/backend/components/communication/src/main/java/co/airy/core/communication/dto/UnreadCountState.java
similarity index 90%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/dto/UnreadCountState.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/dto/UnreadCountState.java
index 72a2b417b6..345316e39d 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/dto/UnreadCountState.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/dto/UnreadCountState.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.dto;
+package co.airy.core.communication.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/AiryAnalyzer.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/AiryAnalyzer.java
similarity index 92%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/AiryAnalyzer.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/AiryAnalyzer.java
index f289c83fed..c842aba28e 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/AiryAnalyzer.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/AiryAnalyzer.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/DocumentMapper.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/DocumentMapper.java
similarity index 96%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/DocumentMapper.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/DocumentMapper.java
index 96bb705564..fb14b60a6e 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/DocumentMapper.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/DocumentMapper.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
-import co.airy.core.api.communication.dto.ConversationIndex;
+import co.airy.core.communication.dto.ConversationIndex;
 import co.airy.model.metadata.dto.MetadataNode;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/ExtendedQueryParser.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/ExtendedQueryParser.java
similarity index 97%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/ExtendedQueryParser.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/ExtendedQueryParser.java
index b73c980025..026661875a 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/ExtendedQueryParser.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/ExtendedQueryParser.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.IntPoint;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/IndexingProcessor.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/IndexingProcessor.java
similarity index 92%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/IndexingProcessor.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/IndexingProcessor.java
index 53b98065d9..2f302e5375 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/IndexingProcessor.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/IndexingProcessor.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
-import co.airy.core.api.communication.dto.ConversationIndex;
+import co.airy.core.communication.dto.ConversationIndex;
 import co.airy.model.conversation.Conversation;
 import org.apache.kafka.streams.processor.Processor;
 import org.apache.kafka.streams.processor.ProcessorContext;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneDiskStore.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneDiskStore.java
similarity index 96%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneDiskStore.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneDiskStore.java
index 75deb46aa7..d34a781b79 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneDiskStore.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneDiskStore.java
@@ -1,7 +1,7 @@
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
-import co.airy.core.api.communication.dto.ConversationIndex;
-import co.airy.core.api.communication.dto.LuceneQueryResult;
+import co.airy.core.communication.dto.ConversationIndex;
+import co.airy.core.communication.dto.LuceneQueryResult;
 import co.airy.kafka.core.serdes.KafkaHybridSerde;
 import co.airy.log.AiryLoggerFactory;
 import org.apache.kafka.common.serialization.Serdes;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneProvider.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneProvider.java
similarity index 95%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneProvider.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneProvider.java
index 3953802af1..82629e43fa 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneProvider.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneProvider.java
@@ -1,7 +1,7 @@
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
-import co.airy.core.api.communication.dto.ConversationIndex;
-import co.airy.core.api.communication.dto.LuceneQueryResult;
+import co.airy.core.communication.dto.ConversationIndex;
+import co.airy.core.communication.dto.LuceneQueryResult;
 import co.airy.log.AiryLoggerFactory;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneStore.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneStore.java
similarity index 65%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneStore.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneStore.java
index 93438eddef..27e6e08c54 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/LuceneStore.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/LuceneStore.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
-import co.airy.core.api.communication.dto.ConversationIndex;
+import co.airy.core.communication.dto.ConversationIndex;
 
 import java.io.IOException;
 
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/ReadOnlyLuceneStore.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/ReadOnlyLuceneStore.java
similarity index 58%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/ReadOnlyLuceneStore.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/ReadOnlyLuceneStore.java
index 4599b79d39..06b984ec21 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/ReadOnlyLuceneStore.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/ReadOnlyLuceneStore.java
@@ -1,6 +1,6 @@
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
-import co.airy.core.api.communication.dto.LuceneQueryResult;
+import co.airy.core.communication.dto.LuceneQueryResult;
 import org.apache.lucene.search.Query;
 
 public interface ReadOnlyLuceneStore {
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/StoreChangeLogger.java b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/StoreChangeLogger.java
similarity index 98%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/StoreChangeLogger.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/lucene/StoreChangeLogger.java
index 309ed86d15..e59281cdf4 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/lucene/StoreChangeLogger.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/lucene/StoreChangeLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package co.airy.core.api.communication.lucene;
+package co.airy.core.communication.lucene;
 
 import org.apache.kafka.common.serialization.Serializer;
 import org.apache.kafka.streams.processor.ProcessorContext;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationByIdRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationByIdRequestPayload.java
similarity index 86%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationByIdRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationByIdRequestPayload.java
index a402a81cfc..8d1b4efea2 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationByIdRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationByIdRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationListRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationListRequestPayload.java
similarity index 84%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationListRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationListRequestPayload.java
index 9ad6ed2634..d06d4d2702 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationListRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationListRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationListResponsePayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationListResponsePayload.java
similarity index 87%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationListResponsePayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationListResponsePayload.java
index 52b3f8f12c..4dcbd35283 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationListResponsePayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationListResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationResponsePayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationResponsePayload.java
similarity index 96%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationResponsePayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationResponsePayload.java
index 2b28f4387c..95da3b7cc4 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationResponsePayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import co.airy.model.channel.ChannelPayload;
 import co.airy.model.conversation.Conversation;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationSetStateRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationSetStateRequestPayload.java
similarity index 87%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationSetStateRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationSetStateRequestPayload.java
index 646a374704..5987fd01c5 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationSetStateRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationSetStateRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationTagRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationTagRequestPayload.java
similarity index 87%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationTagRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationTagRequestPayload.java
index f6a48fffb1..6edd09a377 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationTagRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationTagRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationUpdateContactRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationUpdateContactRequestPayload.java
similarity index 87%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationUpdateContactRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationUpdateContactRequestPayload.java
index f057c9d9cb..977602dc0c 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ConversationUpdateContactRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ConversationUpdateContactRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageListRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageListRequestPayload.java
similarity index 87%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageListRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageListRequestPayload.java
index 4760559a52..341926bb1d 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageListRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageListRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageListResponsePayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageListResponsePayload.java
similarity index 88%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageListResponsePayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageListResponsePayload.java
index 632161aae3..33e8d6b030 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageListResponsePayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageListResponsePayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import co.airy.model.message.dto.MessageResponsePayload;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageSuggestRepliesRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageSuggestRepliesRequestPayload.java
similarity index 92%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageSuggestRepliesRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageSuggestRepliesRequestPayload.java
index 241c61a868..6af6cda48e 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageSuggestRepliesRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageSuggestRepliesRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageUpsertPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageUpsertPayload.java
similarity index 88%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageUpsertPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageUpsertPayload.java
index ac0e8e6990..19ef8f511d 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/MessageUpsertPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/MessageUpsertPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import co.airy.model.message.dto.MessageResponsePayload;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/PaginationData.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/PaginationData.java
similarity index 85%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/PaginationData.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/PaginationData.java
index 0df856e184..a1801a8bb1 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/PaginationData.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/PaginationData.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/RemoveMetadataRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/RemoveMetadataRequestPayload.java
similarity index 87%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/RemoveMetadataRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/RemoveMetadataRequestPayload.java
index a6b3928a83..1a293df474 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/RemoveMetadataRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/RemoveMetadataRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ResendMessageRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ResendMessageRequestPayload.java
similarity index 84%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ResendMessageRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/ResendMessageRequestPayload.java
index a33bca079b..412dae3744 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/ResendMessageRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/ResendMessageRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/SendMessageRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/SendMessageRequestPayload.java
similarity index 90%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/SendMessageRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/SendMessageRequestPayload.java
index 467d226d06..ed7b53c5fc 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/SendMessageRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/SendMessageRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/SetMetadataRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/SetMetadataRequestPayload.java
similarity index 88%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/SetMetadataRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/SetMetadataRequestPayload.java
index 009258f42d..a4761e4d7d 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/SetMetadataRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/SetMetadataRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/UnreadCountPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/UnreadCountPayload.java
similarity index 86%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/UnreadCountPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/UnreadCountPayload.java
index dbf8e64fc4..fe48c090bd 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/UnreadCountPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/UnreadCountPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/UpsertMetadataRequestPayload.java b/backend/components/communication/src/main/java/co/airy/core/communication/payload/UpsertMetadataRequestPayload.java
similarity index 92%
rename from backend/components/communication/src/main/java/co/airy/core/api/communication/payload/UpsertMetadataRequestPayload.java
rename to backend/components/communication/src/main/java/co/airy/core/communication/payload/UpsertMetadataRequestPayload.java
index f1102cccba..600fa87d3c 100644
--- a/backend/components/communication/src/main/java/co/airy/core/api/communication/payload/UpsertMetadataRequestPayload.java
+++ b/backend/components/communication/src/main/java/co/airy/core/communication/payload/UpsertMetadataRequestPayload.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.payload;
+package co.airy.core.communication.payload;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsInfoTest.java b/backend/components/communication/src/test/java/co/airy/core/communication/ConversationsInfoTest.java
similarity index 84%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsInfoTest.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/ConversationsInfoTest.java
index f37cffc8ed..00a25e9de9 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsInfoTest.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/ConversationsInfoTest.java
@@ -1,10 +1,11 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
 import co.airy.avro.communication.Metadata;
 import co.airy.avro.communication.User;
-import co.airy.core.api.communication.util.TestConversation;
+import co.airy.core.communication.util.TestConversation;
+import co.airy.core.communication.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.model.metadata.MetadataKeys;
@@ -26,10 +27,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationChannels;
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationMetadata;
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationUsers;
-import static co.airy.core.api.communication.util.Topics.getTopics;
 import static co.airy.model.metadata.MetadataRepository.getId;
 import static co.airy.model.metadata.MetadataRepository.newChannelMetadata;
 import static co.airy.test.Timing.retryOnException;
@@ -52,7 +49,7 @@ class ConversationsInfoTest {
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, getTopics());
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
         kafkaTestHelper.beforeAll();
     }
 
@@ -86,9 +83,9 @@ void canFetchConversationsInfo() throws Exception {
 
         final Metadata metadata = newChannelMetadata(channel.getId(), MetadataKeys.ChannelKeys.NAME, channelName);
         kafkaTestHelper.produceRecords(List.of(
-                new ProducerRecord<>(applicationCommunicationUsers.name(), user.getId(), user),
-                new ProducerRecord<>(applicationCommunicationMetadata.name(), getId(metadata).toString(), metadata),
-                new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId(), channel)
+                new ProducerRecord<>(Topics.applicationCommunicationUsers.name(), user.getId(), user),
+                new ProducerRecord<>(Topics.applicationCommunicationMetadata.name(), getId(metadata).toString(), metadata),
+                new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channel.getId(), channel)
         ));
         final String conversationId = UUID.randomUUID().toString();
         kafkaTestHelper.produceRecords(TestConversation.generateRecords(conversationId, channel, 1, userId));
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsListTest.java b/backend/components/communication/src/test/java/co/airy/core/communication/ConversationsListTest.java
similarity index 94%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsListTest.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/ConversationsListTest.java
index cf2848ce1d..459ed45d50 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsListTest.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/ConversationsListTest.java
@@ -1,8 +1,9 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
-import co.airy.core.api.communication.util.TestConversation;
+import co.airy.core.communication.util.TestConversation;
+import co.airy.core.communication.util.Topics;
 import co.airy.date.format.DateFormat;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
@@ -29,8 +30,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationChannels;
-import static co.airy.core.api.communication.util.Topics.getTopics;
 import static co.airy.test.Timing.retryOnException;
 import static java.util.Comparator.reverseOrder;
 import static java.util.stream.Collectors.toList;
@@ -82,18 +81,18 @@ class ConversationsListTest {
                     Map.of(MetadataKeys.ConversationKeys.TAGS + "." + tagId, "", MetadataKeys.ConversationKeys.TAGS + "." + anotherTagId, ""),
                     1),
             TestConversation.from(conversationIdToFind, defaultChannel, Map.of(MetadataKeys.ConversationKeys.TAGS + "." + tagId, ""), 1),
-            TestConversation.from(UUID.randomUUID().toString(), defaultChannel, Map.of("user_data.erp.id", "abc"), 2),
-            TestConversation.from(UUID.randomUUID().toString(), defaultChannel, 5)
+            TestConversation.from(UUID.randomUUID().toString(), defaultChannel, Map.of("user_data.erp.id", "abc", MetadataKeys.ConversationKeys.UNREAD_COUNT, "2"), 2),
+            TestConversation.from(UUID.randomUUID().toString(), defaultChannel, Map.of(MetadataKeys.ConversationKeys.UNREAD_COUNT, "5"), 5)
     );
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, getTopics());
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
 
         kafkaTestHelper.beforeAll();
 
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), defaultChannel.getId(), defaultChannel));
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channelToFind.getId(), channelToFind));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), defaultChannel.getId(), defaultChannel));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channelToFind.getId(), channelToFind));
 
         kafkaTestHelper.produceRecords(conversations.stream().map(TestConversation::getRecords).flatMap(Collection::stream).collect(toList()));
     }
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsTagTest.java b/backend/components/communication/src/test/java/co/airy/core/communication/ConversationsTagTest.java
similarity index 91%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsTagTest.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/ConversationsTagTest.java
index 1342503f39..bfa3923b74 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsTagTest.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/ConversationsTagTest.java
@@ -1,8 +1,9 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
-import co.airy.core.api.communication.util.TestConversation;
+import co.airy.core.communication.util.TestConversation;
+import co.airy.core.communication.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.spring.core.AirySpringBootApplication;
@@ -22,8 +23,6 @@
 
 import java.util.UUID;
 
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationChannels;
-import static co.airy.core.api.communication.util.Topics.getTopics;
 import static co.airy.test.Timing.retryOnException;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
@@ -46,7 +45,7 @@ class ConversationsTagTest {
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, getTopics());
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
         kafkaTestHelper.beforeAll();
     }
 
@@ -69,7 +68,7 @@ void canTagAndUntagConversations() throws Exception {
                 .setSourceChannelId("ps-id")
                 .build();
 
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId(), channel));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channel.getId(), channel));
         final String conversationId = UUID.randomUUID().toString();
         kafkaTestHelper.produceRecords(TestConversation.generateRecords(conversationId, channel, 1));
 
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsUpdateTest.java b/backend/components/communication/src/test/java/co/airy/core/communication/ConversationsUpdateTest.java
similarity index 93%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsUpdateTest.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/ConversationsUpdateTest.java
index 91ec50a859..0267d096a7 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/ConversationsUpdateTest.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/ConversationsUpdateTest.java
@@ -1,8 +1,9 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
-import co.airy.core.api.communication.util.TestConversation;
+import co.airy.core.communication.util.TestConversation;
+import co.airy.core.communication.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.spring.core.AirySpringBootApplication;
@@ -22,8 +23,6 @@
 
 import java.util.UUID;
 
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationChannels;
-import static co.airy.core.api.communication.util.Topics.getTopics;
 import static co.airy.test.Timing.retryOnException;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.Is.is;
@@ -53,9 +52,9 @@ class ConversationsUpdateTest {
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, getTopics());
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
         kafkaTestHelper.beforeAll();
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId(), channel));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channel.getId(), channel));
         kafkaTestHelper.produceRecords(TestConversation.generateRecords(conversationId, channel, 1));
     }
 
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/MessagesTest.java b/backend/components/communication/src/test/java/co/airy/core/communication/MessagesTest.java
similarity index 89%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/MessagesTest.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/MessagesTest.java
index 61f2aa6091..acc4f1656a 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/MessagesTest.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/MessagesTest.java
@@ -1,10 +1,11 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
 import co.airy.avro.communication.DeliveryState;
 import co.airy.avro.communication.Message;
-import co.airy.core.api.communication.util.TestConversation;
+import co.airy.core.communication.util.TestConversation;
+import co.airy.core.communication.util.Topics;
 import co.airy.date.format.DateFormat;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
@@ -31,10 +32,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationChannels;
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationMessages;
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationMetadata;
-import static co.airy.core.api.communication.util.Topics.getTopics;
 import static co.airy.model.metadata.MetadataRepository.newMessageMetadata;
 import static co.airy.test.Timing.retryOnException;
 import static java.util.Comparator.reverseOrder;
@@ -67,9 +64,9 @@ public class MessagesTest {
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, getTopics());
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
         kafkaTestHelper.beforeAll();
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channelId, channel));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channelId, channel));
     }
 
     @AfterAll
@@ -125,7 +122,7 @@ void canDeleteMessages() throws Exception {
         final JsonNode jsonNode = new ObjectMapper().readTree(content);
         final String messageId = jsonNode.get("data").get(0).get("id").textValue();
 
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationMessages.name(), messageId, null));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), messageId, null));
         retryOnException(
                 () -> webTestHelper.post("/messages.list", payload)
                         .andExpect(status().isOk())
@@ -139,7 +136,7 @@ void canReturnMetadata() throws Exception {
         final String text = "MESSAGE TEXT";
 
         kafkaTestHelper.produceRecords(List.of(
-                new ProducerRecord<>(applicationCommunicationMessages.name(), messageId, Message.newBuilder()
+                new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), messageId, Message.newBuilder()
                         .setId(messageId)
                         .setSentAt(Instant.now().toEpochMilli())
                         .setSenderId("source-conversation-id")
@@ -151,7 +148,7 @@ void canReturnMetadata() throws Exception {
                         .setContent("{\"text\":\"" + text + "\"}")
                         .setIsFromContact(true)
                         .build()),
-                new ProducerRecord<>(applicationCommunicationMetadata.name(), "metadata-id",
+                new ProducerRecord<>(Topics.applicationCommunicationMetadata.name(), "metadata-id",
                         newMessageMetadata(messageId, "metadata_key", "message metadata value"))
         ));
 
@@ -173,7 +170,7 @@ void canReplaceMessageContentUrl() throws Exception {
 
         final String messageId = UUID.randomUUID().toString();
         kafkaTestHelper.produceRecords(List.of(
-                new ProducerRecord<>(applicationCommunicationMessages.name(), messageId, Message.newBuilder()
+                new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), messageId, Message.newBuilder()
                         .setId(messageId)
                         .setSentAt(Instant.now().toEpochMilli())
                         .setSenderId("source-conversation-id")
@@ -185,7 +182,7 @@ void canReplaceMessageContentUrl() throws Exception {
                         .setContent(String.format("{\"url\":\"%s\"}", sourceUrl))
                         .setIsFromContact(true)
                         .build()),
-                new ProducerRecord<>(applicationCommunicationMetadata.name(), "metadata-id",
+                new ProducerRecord<>(Topics.applicationCommunicationMetadata.name(), "metadata-id",
                         newMessageMetadata(messageId, "data_" + sourceUrl, persistentUrl))
         ));
 
@@ -206,14 +203,14 @@ void sameMessageTimesWork() throws Exception {
         final long sentAt = Instant.now().toEpochMilli();
 
         kafkaTestHelper.produceRecords(List.of(
-                new ProducerRecord<>(applicationCommunicationChannels.name(), channelId, Channel.newBuilder()
+                new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channelId, Channel.newBuilder()
                         .setSourceChannelId("sourceChannelId")
                         .setSource("twilio.sms")
                         .setId(channelId)
                         .setConnectionState(ChannelConnectionState.CONNECTED)
                         .build()
                 ),
-                new ProducerRecord<>(applicationCommunicationMessages.name(), firstMessageId,
+                new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), firstMessageId,
                         Message.newBuilder()
                                 .setId(firstMessageId)
                                 .setSource("source")
@@ -225,7 +222,7 @@ void sameMessageTimesWork() throws Exception {
                                 .setContent("content")
                                 .setIsFromContact(true)
                                 .build()),
-                new ProducerRecord<>(applicationCommunicationMessages.name(), secondMessageId,
+                new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), secondMessageId,
                         Message.newBuilder()
                                 .setId(secondMessageId)
                                 .setSource("source")
@@ -251,7 +248,7 @@ void sameMessageTimesWork() throws Exception {
     void canSuggestReplies() throws Exception {
         final String messageId = UUID.randomUUID().toString();
         kafkaTestHelper.produceRecords(List.of(
-                new ProducerRecord<>(applicationCommunicationMessages.name(), messageId,
+                new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), messageId,
                         Message.newBuilder()
                                 .setId(messageId)
                                 .setSource("twilio.sms")
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/MetadataControllerTest.java b/backend/components/communication/src/test/java/co/airy/core/communication/MetadataControllerTest.java
similarity index 86%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/MetadataControllerTest.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/MetadataControllerTest.java
index 1c60a1d966..ebcc803875 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/MetadataControllerTest.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/MetadataControllerTest.java
@@ -1,7 +1,9 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
+import co.airy.core.communication.util.TestConversation;
+import co.airy.core.communication.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.spring.core.AirySpringBootApplication;
@@ -23,9 +25,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import static co.airy.core.api.communication.util.TestConversation.generateRecords;
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationChannels;
-import static co.airy.core.api.communication.util.Topics.getTopics;
+import static co.airy.core.communication.util.TestConversation.generateRecords;
 import static co.airy.test.Timing.retryOnException;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.core.Is.is;
@@ -54,10 +54,10 @@ public class MetadataControllerTest {
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, getTopics());
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
 
         kafkaTestHelper.beforeAll();
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId().toString(), channel));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channel.getId().toString(), channel));
     }
 
     @AfterAll
@@ -73,8 +73,8 @@ void beforeEach() throws Exception {
     @Test
     void canUpsertMetadata() throws Exception {
         final String conversationId = UUID.randomUUID().toString();
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId(), channel));
-        final List<ProducerRecord<String, SpecificRecordBase>> producerRecords = generateRecords(conversationId, channel, 1);
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channel.getId(), channel));
+        final List<ProducerRecord<String, SpecificRecordBase>> producerRecords = TestConversation.generateRecords(conversationId, channel, 1);
         kafkaTestHelper.produceRecords(producerRecords);
         final String messageId = producerRecords.get(0).key();
 
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/SendMessageControllerTest.java b/backend/components/communication/src/test/java/co/airy/core/communication/SendMessageControllerTest.java
similarity index 90%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/SendMessageControllerTest.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/SendMessageControllerTest.java
index a4e8eef38b..c707a580f5 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/SendMessageControllerTest.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/SendMessageControllerTest.java
@@ -1,10 +1,11 @@
-package co.airy.core.api.communication;
+package co.airy.core.communication;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.ChannelConnectionState;
 import co.airy.avro.communication.DeliveryState;
 import co.airy.avro.communication.Message;
-import co.airy.core.api.communication.util.TestConversation;
+import co.airy.core.communication.util.TestConversation;
+import co.airy.core.communication.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
 import co.airy.model.message.dto.MessageContainer;
@@ -40,9 +41,6 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationChannels;
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationMessages;
-import static co.airy.core.api.communication.util.Topics.getTopics;
 import static co.airy.test.Timing.retryOnException;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -80,11 +78,11 @@ public class SendMessageControllerTest {
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, getTopics());
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
 
         kafkaTestHelper.beforeAll();
 
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId(), channel));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channel.getId(), channel));
         kafkaTestHelper.produceRecords(TestConversation.generateRecords(conversationId, channel, 1));
     }
 
@@ -120,7 +118,7 @@ void canSendMessage() throws Exception {
         final JsonNode responseNode = new ObjectMapper().readTree(response);
         final String messageId = responseNode.get("id").textValue();
 
-        List<ConsumerRecord<String, Message>> records = kafkaTestHelper.consumeRecords(2, applicationCommunicationMessages.name());
+        List<ConsumerRecord<String, Message>> records = kafkaTestHelper.consumeRecords(2, Topics.applicationCommunicationMessages.name());
         assertThat(records, hasSize(2));
 
         final Optional<Message> maybeMessage = records.stream()
@@ -143,7 +141,7 @@ void canSendMessage() throws Exception {
                 .andExpect(status().isConflict());
 
         message.setDeliveryState(DeliveryState.FAILED);
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationMessages.name(), message.getId(), message));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), message.getId(), message));
 
         retryOnException(() -> {
             webTestHelper.post("/messages.resend", resendRequestPayload)
@@ -197,7 +195,7 @@ void canSendMessageAsync() throws Exception {
         final JsonNode responseNode = new ObjectMapper().readTree(response);
         final String messageId = responseNode.get("id").textValue();
 
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId(), channel));
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationChannels.name(), channel.getId(), channel));
         kafkaTestHelper.produceRecords(TestConversation.generateRecords(conversationId, channel, 1));
 
         retryOnException(
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/util/TestConversation.java b/backend/components/communication/src/test/java/co/airy/core/communication/util/TestConversation.java
similarity index 99%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/util/TestConversation.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/util/TestConversation.java
index 51ee44f681..3a3696a59c 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/util/TestConversation.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/util/TestConversation.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.util;
+package co.airy.core.communication.util;
 
 import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.DeliveryState;
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/util/Topics.java b/backend/components/communication/src/test/java/co/airy/core/communication/util/Topics.java
similarity index 81%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/util/Topics.java
rename to backend/components/communication/src/test/java/co/airy/core/communication/util/Topics.java
index c0749cf363..9803a9acd0 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/util/Topics.java
+++ b/backend/components/communication/src/test/java/co/airy/core/communication/util/Topics.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.util;
+package co.airy.core.communication.util;
 
 import co.airy.kafka.schema.Topic;
 import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
@@ -11,10 +11,9 @@ public class Topics {
     public static final ApplicationCommunicationMessages applicationCommunicationMessages = new ApplicationCommunicationMessages();
     public static final ApplicationCommunicationChannels applicationCommunicationChannels = new ApplicationCommunicationChannels();
     public static final ApplicationCommunicationMetadata applicationCommunicationMetadata = new ApplicationCommunicationMetadata();
-    public static final ApplicationCommunicationReadReceipts applicationCommunicationReadReceipts = new ApplicationCommunicationReadReceipts();
     public static final ApplicationCommunicationUsers applicationCommunicationUsers = new ApplicationCommunicationUsers();
 
     public static Topic[] getTopics() {
-        return new Topic[]{applicationCommunicationMessages, applicationCommunicationChannels, applicationCommunicationMetadata, applicationCommunicationReadReceipts, applicationCommunicationUsers};
+        return new Topic[]{applicationCommunicationMessages, applicationCommunicationChannels, applicationCommunicationMetadata, applicationCommunicationUsers};
     }
 }
diff --git a/backend/components/contacts/BUILD b/backend/components/contacts/BUILD
index 2d965faccc..ca82013c19 100644
--- a/backend/components/contacts/BUILD
+++ b/backend/components/contacts/BUILD
@@ -6,8 +6,8 @@ load("//tools/build:container_release.bzl", "container_release")
 
 app_deps = [
     "//backend:base_app",
+    "//backend/model/contact",
     "//backend/model/conversation",
-    "//backend/model/contacts",
     "//backend/model/metadata",
     "//backend/model/message",
     "//lib/java/uuid",
@@ -38,6 +38,7 @@ custom_java_library(
     name = "test-util",
     srcs = [
         "src/test/java/co/airy/core/contacts/util/TestContact.java",
+        "src/test/java/co/airy/core/contacts/util/TestConversation.java",
         "src/test/java/co/airy/core/contacts/util/Topics.java",
     ],
     deps = test_deps,
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/ContactsController.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/ContactsController.java
index 31feb63499..5cf3b9b3cd 100644
--- a/backend/components/contacts/src/main/java/co/airy/core/contacts/ContactsController.java
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/ContactsController.java
@@ -1,7 +1,7 @@
 package co.airy.core.contacts;
 
 import co.airy.avro.communication.Metadata;
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 import co.airy.core.contacts.payload.ContactInfoRequestPayload;
 import co.airy.core.contacts.payload.ContactResponsePayload;
 import co.airy.core.contacts.payload.ContactWithMergeHistoryResponsePayload;
@@ -35,7 +35,7 @@
 import static java.util.stream.Collectors.toList;
 
 @RestController
-public class ContactsController implements HealthIndicator {
+public class ContactsController {
     private final Stores stores;
 
     public ContactsController(Stores stores) {
@@ -215,11 +215,6 @@ public ResponseEntity<?> deleteContact(@RequestBody @Valid DeleteContactPayload
 
         return ResponseEntity.status(HttpStatus.ACCEPTED).build();
     }
-
-    @Override
-    public Health health() {
-        return Health.up().build();
-    }
 }
 
 
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/ConversationsController.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/ConversationsController.java
new file mode 100644
index 0000000000..078090a100
--- /dev/null
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/ConversationsController.java
@@ -0,0 +1,81 @@
+package co.airy.core.contacts;
+
+import co.airy.avro.communication.Message;
+import co.airy.core.contacts.payload.PaginationData;
+import co.airy.core.contacts.payload.RecentMessagesRequestPayload;
+import co.airy.core.contacts.payload.RecentMessagesResponsePayload;
+import co.airy.model.contact.Contact;
+import co.airy.model.message.dto.MessageResponsePayload;
+import co.airy.pagination.Page;
+import co.airy.pagination.Paginator;
+import co.airy.spring.web.payload.RequestErrorResponsePayload;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import static java.util.stream.Collectors.toList;
+
+@RestController
+public class ConversationsController {
+    private final Stores stores;
+
+    public ConversationsController(Stores stores) {
+        this.stores = stores;
+    }
+
+    @PostMapping("/contacts.recent-messages")
+    public ResponseEntity<?> recentMessages(@RequestBody @Valid RecentMessagesRequestPayload payload) {
+        final String contactId = payload.getContactId().toString();
+
+        final Contact contact = stores.getContact(contactId);
+        if (contact == null) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new RequestErrorResponsePayload("Contact not found"));
+        }
+
+        final Map<UUID, String> cursors = payload.getCursors();
+        final int pageSize = payload.getPageSize();
+        final List<String> includeSources = payload.getIncludeSources();
+        Map<String, RecentMessagesResponsePayload> response = new HashMap<>();
+        for (Map.Entry<UUID, String> entry : contact.getConversations().entrySet()) {
+            // Skip sources not included in the filter list
+            if (!includeSources.isEmpty() && !includeSources.contains(entry.getValue())) {
+                continue;
+            }
+
+            try {
+                final UUID conversationId = entry.getKey();
+                final RecentMessagesResponsePayload messages = fetchMessages(conversationId.toString(), pageSize, cursors.get(conversationId));
+                response.put(conversationId.toString(), messages);
+            } catch (Exception e) {
+                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+            }
+        }
+
+        return ResponseEntity.status(HttpStatus.OK).body(response);
+    }
+
+
+    private RecentMessagesResponsePayload fetchMessages(String conversationId, int pageSize, String cursor) {
+        final List<Message> messages = stores.getMessages(conversationId);
+        if (messages == null) {
+            return null;
+        }
+
+        Paginator<Message> paginator = new Paginator<>(messages, Message::getId).perPage(pageSize).from(cursor);
+
+        Page<Message> page = paginator.page();
+
+        return RecentMessagesResponsePayload.builder().data(page.getData().stream().map(MessageResponsePayload::fromMessage).collect(toList())).paginationData(PaginationData.builder().nextCursor(page.getNextCursor()).previousCursor(cursor).total(messages.size()).build()).build();
+    }
+}
+
+
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/Stores.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/Stores.java
index cf619b6119..1cc17a4f9d 100644
--- a/backend/components/contacts/src/main/java/co/airy/core/contacts/Stores.java
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/Stores.java
@@ -2,12 +2,13 @@
 
 import co.airy.avro.communication.Message;
 import co.airy.avro.communication.Metadata;
-import co.airy.model.contacts.Contact;
-import co.airy.model.contacts.ConversationContact;
+import co.airy.core.contacts.dto.Messages;
 import co.airy.kafka.schema.application.ApplicationCommunicationContacts;
 import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
 import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
 import co.airy.kafka.streams.KafkaStreamsWrapper;
+import co.airy.model.contact.Contact;
+import co.airy.model.contact.ConversationContact;
 import co.airy.model.conversation.Conversation;
 import co.airy.model.message.dto.MessageContainer;
 import co.airy.model.metadata.MetadataKeys;
@@ -19,8 +20,10 @@
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.KeyValue;
 import org.apache.kafka.streams.StreamsBuilder;
+import org.apache.kafka.streams.kstream.KStream;
 import org.apache.kafka.streams.kstream.KTable;
 import org.apache.kafka.streams.kstream.Materialized;
+import org.apache.kafka.streams.state.KeyValueIterator;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.actuate.health.Health;
@@ -35,8 +38,8 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static co.airy.model.contacts.MetadataRepository.newContactMetadata;
-import static co.airy.model.contacts.Contact.MetadataKeys.CONVERSATIONS;
+import static co.airy.model.contact.Contact.MetadataKeys.CONVERSATIONS;
+import static co.airy.model.contact.MetadataRepository.newContactMetadata;
 import static co.airy.model.metadata.MetadataKeys.ConversationKeys.CONTACT;
 import static co.airy.model.metadata.MetadataRepository.getId;
 import static co.airy.model.metadata.MetadataRepository.getSubject;
@@ -50,6 +53,7 @@ public class Stores implements ApplicationListener<ApplicationReadyEvent>, Dispo
     private final KafkaProducer<String, SpecificRecordBase> producer;
     private final String contactsStore = "contacts-store";
     private final String conversationsStore = "conversations-store";
+    private final String messagesStore = "messages-store";
     private final String conversationToContactStore = "conversation-to-contact-map";
     private final String applicationCommunicationContacts = new ApplicationCommunicationContacts().name();
 
@@ -87,9 +91,10 @@ public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
                 .aggregate(MetadataMap::new, MetadataMap::adder, MetadataMap::subtractor);
 
 
+        final KStream<String, Message> messageStream = builder.stream(new ApplicationCommunicationMessages().name());
         // 1. Auto create contacts if they don't exist
         // 2. Populate contact metadata with conversation metadata (if missing)
-        builder.<String, Message>stream(new ApplicationCommunicationMessages().name())
+        messageStream
                 .filter((messageId, message) -> message != null)
                 .groupBy((messageId, message) -> message.getConversationId())
                 .aggregate(Conversation::new,
@@ -158,6 +163,19 @@ public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
                 })
                 .to(applicationCommunicationContacts);
 
+        // Conversations data necessary for the contact messages endpoint
+        messageStream.toTable()
+                .groupBy((messageId, message) -> KeyValue.pair(message.getConversationId(), message))
+                .aggregate(Messages::new,
+                        (key, value, aggregate) -> {
+                            aggregate.update(value);
+                            return aggregate;
+                        }, (key, value, aggregate) -> {
+                            aggregate.remove(value);
+                            return aggregate;
+                        }, Materialized.as(messagesStore));
+
+
         streams.start(builder.build(), appId);
     }
 
@@ -169,6 +187,10 @@ private ReadOnlyKeyValueStore<String, Conversation> getConversationsStore() {
         return streams.acquireLocalStore(conversationsStore);
     }
 
+    private ReadOnlyKeyValueStore<String, Messages> getMessagesStore() {
+        return streams.acquireLocalStore(messagesStore);
+    }
+
     private ReadOnlyKeyValueStore<String, MetadataMap> getConversationToContactStore() {
         return streams.acquireLocalStore(conversationToContactStore);
     }
@@ -176,7 +198,9 @@ private ReadOnlyKeyValueStore<String, MetadataMap> getConversationToContactStore
     public List<Contact> getAllContacts() {
         final ReadOnlyKeyValueStore<String, MetadataMap> store = getContactStore();
         final List<Contact> contacts = new ArrayList<>();
-        store.all().forEachRemaining(entry -> contacts.add(Contact.fromMetadataMap(entry.value)));
+        try (KeyValueIterator<String, MetadataMap> iterator = store.all()) {
+            iterator.forEachRemaining(entry -> contacts.add(Contact.fromMetadataMap(entry.value)));
+        }
         return contacts;
     }
 
@@ -199,10 +223,22 @@ public void storeContact(List<Metadata> metadataList) throws Exception {
         }
     }
 
+    public List<Message> getMessages(String conversationId) {
+        final ReadOnlyKeyValueStore<String, Messages> store = getMessagesStore();
+        final Messages messages = store.get(conversationId);
+
+        if (messages == null) {
+            return null;
+        }
+        return new ArrayList<>(messages);
+    }
+
+
     @Override
     public Health health() {
         getContactStore();
         getConversationsStore();
+        getMessagesStore();
         getConversationToContactStore();
         return Health.up().build();
     }
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/dto/Messages.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/dto/Messages.java
new file mode 100644
index 0000000000..2326d1cd4b
--- /dev/null
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/dto/Messages.java
@@ -0,0 +1,26 @@
+package co.airy.core.contacts.dto;
+
+import co.airy.avro.communication.Message;
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+import java.util.concurrent.ConcurrentSkipListSet;
+
+public class Messages extends ConcurrentSkipListSet<Message> {
+    @JsonCreator
+    public Messages() {
+        super((Message c1, Message c2) -> {
+            if (c1.getSentAt() == c2.getSentAt()) {
+                // If messages share the same timestamp use the id
+                return c1.getId().compareTo(c2.getId());
+            }
+
+            return Long.compare(c2.getSentAt(), c1.getSentAt());
+        });
+    }
+
+    // TreeSet does not support updating objects
+    public void update(Message message) {
+        remove(message);
+        add(message);
+    }
+}
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/ContactResponsePayload.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/ContactResponsePayload.java
index 9f886b33a5..1356e3e633 100644
--- a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/ContactResponsePayload.java
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/ContactResponsePayload.java
@@ -1,6 +1,6 @@
 package co.airy.core.contacts.payload;
 
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/ContactWithMergeHistoryResponsePayload.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/ContactWithMergeHistoryResponsePayload.java
index bf9bf2bae9..a136ad9e09 100644
--- a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/ContactWithMergeHistoryResponsePayload.java
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/ContactWithMergeHistoryResponsePayload.java
@@ -1,6 +1,6 @@
 package co.airy.core.contacts.payload;
 
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/CreateContactPayload.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/CreateContactPayload.java
index e6dd1c867f..ca24050dbe 100644
--- a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/CreateContactPayload.java
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/CreateContactPayload.java
@@ -1,6 +1,6 @@
 package co.airy.core.contacts.payload;
 
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/RecentMessagesRequestPayload.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/RecentMessagesRequestPayload.java
new file mode 100644
index 0000000000..4ca0710f53
--- /dev/null
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/RecentMessagesRequestPayload.java
@@ -0,0 +1,24 @@
+package co.airy.core.contacts.payload;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RecentMessagesRequestPayload {
+    @NotNull
+    private UUID contactId;
+    private List<String> includeSources = new ArrayList<>();
+    private int pageSize = 20;
+    private Map<UUID, String> cursors = new HashMap<>();
+}
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/RecentMessagesResponsePayload.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/RecentMessagesResponsePayload.java
new file mode 100644
index 0000000000..3e8a7ad95c
--- /dev/null
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/RecentMessagesResponsePayload.java
@@ -0,0 +1,18 @@
+package co.airy.core.contacts.payload;
+
+import co.airy.model.message.dto.MessageResponsePayload;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RecentMessagesResponsePayload {
+    private List<MessageResponsePayload> data;
+    private PaginationData paginationData;
+}
diff --git a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/UpdateContactPayload.java b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/UpdateContactPayload.java
index 9cd36caf9a..368ac23ce5 100644
--- a/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/UpdateContactPayload.java
+++ b/backend/components/contacts/src/main/java/co/airy/core/contacts/payload/UpdateContactPayload.java
@@ -1,6 +1,6 @@
 package co.airy.core.contacts.payload;
 
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/backend/components/contacts/src/test/java/co/airy/core/contacts/DeleteContactTest.java b/backend/components/contacts/src/test/java/co/airy/core/contacts/DeleteContactTest.java
index 8cce5248ad..55d5c6a1b2 100644
--- a/backend/components/contacts/src/test/java/co/airy/core/contacts/DeleteContactTest.java
+++ b/backend/components/contacts/src/test/java/co/airy/core/contacts/DeleteContactTest.java
@@ -2,7 +2,7 @@
 
 import co.airy.spring.core.AirySpringBootApplication;
 import co.airy.spring.test.WebTestHelper;
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 import co.airy.core.contacts.payload.DeleteContactPayload;
 import co.airy.core.contacts.util.TestContact;
 import co.airy.core.contacts.util.Topics;
@@ -76,7 +76,7 @@ void canDeleteContact() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.data", hasSize(1)));
         }, "Contact was not created");
-        
+
         webTestHelper.post(
                 "/contacts.delete",
                 objectMapper.writeValueAsString(DeleteContactPayload.builder().id(UUID.fromString(contactId)).build()))
diff --git a/backend/components/contacts/src/test/java/co/airy/core/contacts/ListContactsTest.java b/backend/components/contacts/src/test/java/co/airy/core/contacts/ListContactsTest.java
index c7fae3cf4f..0074d445be 100644
--- a/backend/components/contacts/src/test/java/co/airy/core/contacts/ListContactsTest.java
+++ b/backend/components/contacts/src/test/java/co/airy/core/contacts/ListContactsTest.java
@@ -1,6 +1,6 @@
 package co.airy.core.contacts;
 
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 import co.airy.core.contacts.util.TestContact;
 import co.airy.core.contacts.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
diff --git a/backend/components/contacts/src/test/java/co/airy/core/contacts/RecentMessagesTest.java b/backend/components/contacts/src/test/java/co/airy/core/contacts/RecentMessagesTest.java
new file mode 100644
index 0000000000..02a5ac486d
--- /dev/null
+++ b/backend/components/contacts/src/test/java/co/airy/core/contacts/RecentMessagesTest.java
@@ -0,0 +1,119 @@
+package co.airy.core.contacts;
+
+import co.airy.core.contacts.util.TestContact;
+import co.airy.core.contacts.util.TestConversation;
+import co.airy.core.contacts.util.Topics;
+import co.airy.kafka.test.KafkaTestHelper;
+import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.model.contact.Contact;
+import co.airy.spring.core.AirySpringBootApplication;
+import co.airy.spring.test.WebTestHelper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.JsonPath;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static co.airy.test.Timing.retryOnException;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AirySpringBootApplication.class)
+@TestPropertySource(value = "classpath:test.properties")
+@AutoConfigureMockMvc
+@ExtendWith(SpringExtension.class)
+public class RecentMessagesTest {
+    @RegisterExtension
+    public static final SharedKafkaTestResource sharedKafkaTestResource = new SharedKafkaTestResource();
+    private static KafkaTestHelper kafkaTestHelper;
+
+    @Autowired
+    private WebTestHelper webTestHelper;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource,
+                Topics.getTopics());
+        kafkaTestHelper.beforeAll();
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        kafkaTestHelper.afterAll();
+    }
+
+    @BeforeEach
+    void beforeEach() throws Exception {
+        MockitoAnnotations.openMocks(this);
+        webTestHelper.waitUntilHealthy();
+    }
+
+    @Autowired
+    private TestContact testContact;
+
+    @Test
+    void canListAndPaginateRecentMessages() throws Exception {
+        final TestConversation conversation1 = TestConversation.from("messenger", 2);
+        final TestConversation conversation2 = TestConversation.from("purchases", 1);
+        final TestConversation conversation3 = TestConversation.from("exclude_this_source", 1);
+        final UUID conversationId1 = UUID.fromString(conversation1.getConversationId());
+        final UUID conversationId2 = UUID.fromString(conversation2.getConversationId());
+        final UUID conversationId3 = UUID.fromString(conversation3.getConversationId());
+        kafkaTestHelper.produceRecords(conversation1.getRecords());
+        kafkaTestHelper.produceRecords(conversation2.getRecords());
+        kafkaTestHelper.produceRecords(conversation3.getRecords());
+
+        final String contactId = testContact.createContact(Contact.builder()
+                .displayName("Grace Hopper")
+                .conversations(Map.of(conversationId1, "messenger",
+                        conversationId2, "purchases",
+                        conversationId3, "exclude_this_source"))
+                .build());
+
+        retryOnException(() -> {
+            final String response = webTestHelper.post("/contacts.recent-messages",
+                            "{\"contact_id\":\"" + contactId + "\",\"page_size\":1," +
+                                    "\"include_sources\":[\"messenger\",\"purchases\"]}")
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$['" + conversationId1 + "'].data.length()", equalTo(1)))
+                    .andExpect(jsonPath("$['" + conversationId1 + "'].pagination_data.next_cursor").isNotEmpty())
+                    .andExpect(jsonPath("$['" + conversationId1 + "'].pagination_data.total", equalTo(2)))
+                    .andExpect(jsonPath("$['" + conversationId2 + "'].data.length()", equalTo(1)))
+                    .andExpect(jsonPath("$['" + conversationId2 + "'].pagination_data.next_cursor").value(nullValue()))
+                    .andExpect(jsonPath("$['" + conversationId2 + "'].pagination_data.total", equalTo(1)))
+                    .andExpect(jsonPath("$['" + conversationId3 + "']").doesNotExist())
+                    .andReturn()
+                    .getResponse().getContentAsString();
+
+            final String cursor = JsonPath.parse(response).read("$['" + conversationId1 + "'].pagination_data.next_cursor");
+
+            // paginate on the first conversation
+            webTestHelper.post("/contacts.recent-messages",
+                            "{\"contact_id\":\"" + contactId + "\",\"page_size\":1," +
+                                    "\"cursors\":{\"" + conversationId1 + "\":\"" + cursor + "\"}}")
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$['" + conversationId1 + "'].data.length()", equalTo(1)))
+                    .andExpect(jsonPath("$['" + conversationId1 + "'].pagination_data.next_cursor").value(nullValue()))
+                    .andExpect(jsonPath("$['" + conversationId2 + "'].data.length()", equalTo(1)))
+                    .andExpect(jsonPath("$['" + conversationId2 + "'].pagination_data.next_cursor").value(nullValue()))
+                    .andExpect(jsonPath("$['" + conversationId2 + "'].pagination_data.total", equalTo(1)))
+                    .andExpect(jsonPath("$['" + conversationId3 + "']").exists());
+
+        }, "Contact messages were not listed");
+    }
+}
diff --git a/backend/components/contacts/src/test/java/co/airy/core/contacts/UpdateContactsTest.java b/backend/components/contacts/src/test/java/co/airy/core/contacts/UpdateContactsTest.java
index f2f5fc0d35..969ba59cdc 100644
--- a/backend/components/contacts/src/test/java/co/airy/core/contacts/UpdateContactsTest.java
+++ b/backend/components/contacts/src/test/java/co/airy/core/contacts/UpdateContactsTest.java
@@ -1,6 +1,6 @@
 package co.airy.core.contacts;
 
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 import co.airy.core.contacts.util.TestContact;
 import co.airy.core.contacts.util.Topics;
 import co.airy.kafka.test.KafkaTestHelper;
diff --git a/backend/components/contacts/src/test/java/co/airy/core/contacts/util/TestContact.java b/backend/components/contacts/src/test/java/co/airy/core/contacts/util/TestContact.java
index 0f3225411e..9218d131e0 100644
--- a/backend/components/contacts/src/test/java/co/airy/core/contacts/util/TestContact.java
+++ b/backend/components/contacts/src/test/java/co/airy/core/contacts/util/TestContact.java
@@ -1,6 +1,6 @@
 package co.airy.core.contacts.util;
 
-import co.airy.model.contacts.Contact;
+import co.airy.model.contact.Contact;
 import co.airy.spring.test.WebTestHelper;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/backend/components/contacts/src/test/java/co/airy/core/contacts/util/TestConversation.java b/backend/components/contacts/src/test/java/co/airy/core/contacts/util/TestConversation.java
new file mode 100644
index 0000000000..c77b7b812c
--- /dev/null
+++ b/backend/components/contacts/src/test/java/co/airy/core/contacts/util/TestConversation.java
@@ -0,0 +1,67 @@
+package co.airy.core.contacts.util;
+
+import co.airy.avro.communication.DeliveryState;
+import co.airy.avro.communication.Message;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.avro.specific.SpecificRecordBase;
+import org.apache.kafka.clients.producer.ProducerRecord;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+
+@Data
+@NoArgsConstructor
+public class TestConversation {
+    private String channelId;
+    private String conversationId;
+    private String source;
+    private Map<String, String> metadata;
+    private long lastMessageSentAt;
+    private List<ProducerRecord<String, SpecificRecordBase>> records;
+
+    public static TestConversation from(String source, int messageCount) {
+        TestConversation testConversation = new TestConversation();
+        testConversation.setConversationId(UUID.randomUUID().toString());
+        testConversation.setSource(source);
+        testConversation.setChannelId(UUID.randomUUID().toString());
+        testConversation.setRecords(testConversation.generateRecords(messageCount));
+
+        return testConversation;
+    }
+
+    private List<ProducerRecord<String, SpecificRecordBase>> generateRecords(int messageCount) {
+        final List<ProducerRecord<String, SpecificRecordBase>> messages = getMessages(messageCount);
+        this.lastMessageSentAt = ((Message) messages.get(messages.size() - 1).value()).getSentAt();
+        return new ArrayList<>(messages);
+    }
+
+
+    private List<ProducerRecord<String, SpecificRecordBase>> getMessages(int messageCount) {
+        List<ProducerRecord<String, SpecificRecordBase>> records = new ArrayList<>();
+        Random random = new Random();
+        Instant startDate = Instant.now().minus(Duration.ofDays(random.nextInt(365)));
+        for (int index = 0; index < messageCount; index++) {
+            final String messageId = UUID.randomUUID().toString();
+            records.add(new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), messageId, Message.newBuilder()
+                    .setId(messageId)
+                    .setSentAt(startDate.minus(Duration.ofDays(messageCount - index)).toEpochMilli())
+                    .setSenderId("senderId")
+                    .setDeliveryState(DeliveryState.DELIVERED)
+                    .setSource("facebook")
+                    .setConversationId(conversationId)
+                    .setHeaders(Map.of())
+                    .setChannelId(channelId)
+                    .setContent("{\"message\":{\"text\":\"hello world\"}}")
+                    .setIsFromContact(true)
+                    .build()));
+        }
+
+        return records;
+    }
+}
diff --git a/backend/components/facebook/connector/BUILD b/backend/components/facebook/connector/BUILD
index 081f5e65ca..f03823280c 100644
--- a/backend/components/facebook/connector/BUILD
+++ b/backend/components/facebook/connector/BUILD
@@ -11,6 +11,7 @@ app_deps = [
     "//backend/model/metadata",
     "//lib/java/uuid",
     "//lib/java/log",
+    "//lib/java/crypto",
     "//lib/java/tracking",
     "//lib/java/spring/web:spring-web",
     "//lib/java/spring/auth:spring-auth",
diff --git a/backend/components/facebook/connector/src/main/java/co/airy/core/sources/facebook/ChannelsController.java b/backend/components/facebook/connector/src/main/java/co/airy/core/sources/facebook/ChannelsController.java
index 3a2941326d..16a740c576 100644
--- a/backend/components/facebook/connector/src/main/java/co/airy/core/sources/facebook/ChannelsController.java
+++ b/backend/components/facebook/connector/src/main/java/co/airy/core/sources/facebook/ChannelsController.java
@@ -50,10 +50,11 @@ ResponseEntity<?> explore(@RequestBody @Valid ExploreRequestPayload payload) {
         try {
             final List<PageWithConnectInfo> pagesInfo = api.getPagesInfo(payload.getAuthToken());
 
-            final KeyValueIterator<String, Channel> iterator = stores.getChannelsStore().all();
-
-            List<Channel> channels = new ArrayList<>();
-            iterator.forEachRemaining(kv -> channels.add(kv.value));
+            List<Channel> channels;
+            try (KeyValueIterator<String, Channel> iterator = stores.getChannelsStore().all()) {
+                channels = new ArrayList<>();
+                iterator.forEachRemaining(kv -> channels.add(kv.value));
+            }
 
             final List<String> connectedSourceIds = channels
                     .stream()
diff --git a/backend/components/facebook/connector/src/main/java/co/airy/core/sources/facebook/WebhookController.java b/backend/components/facebook/connector/src/main/java/co/airy/core/sources/facebook/WebhookController.java
index 8923aa26ad..7e70075086 100644
--- a/backend/components/facebook/connector/src/main/java/co/airy/core/sources/facebook/WebhookController.java
+++ b/backend/components/facebook/connector/src/main/java/co/airy/core/sources/facebook/WebhookController.java
@@ -13,6 +13,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,16 +21,21 @@
 import java.util.Properties;
 import java.util.UUID;
 
+import static co.airy.crypto.Signature.getSha1;
+
 @RestController
 public class WebhookController implements DisposableBean {
     private final String sourceFacebookEvents = new SourceFacebookEvents().name();
     private final String webhookSecret;
+    private final String appSecret;
 
     private final Producer<String, String> producer;
 
     WebhookController(@Value("${kafka.brokers}") String brokers,
-                      @Value("${facebook.webhook-secret}") String webhookSecret) {
+                      @Value("${facebook.webhook-secret}") String webhookSecret,
+                      @Value("${facebook.app-secret}") String appSecret) {
         this.webhookSecret = webhookSecret;
+        this.appSecret = appSecret;
         final Properties props = new Properties();
 
         props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, brokers);
@@ -52,7 +58,11 @@ int verify(@RequestParam(value = "hub.challenge") int challenge, @RequestParam(v
     }
 
     @PostMapping("/facebook")
-    ResponseEntity<Void> accept(@RequestBody String event) {
+    ResponseEntity<Void> accept(@RequestBody String event, @RequestHeader("x-hub-signature") String signature) {
+        if (!isSignatureValid(event, signature)) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
+        }
+
         String requestId = UUID.randomUUID().toString();
         try {
             ProducerRecord<String, String> record = new ProducerRecord<>(sourceFacebookEvents, requestId, event);
@@ -63,6 +73,19 @@ ResponseEntity<Void> accept(@RequestBody String event) {
         }
     }
 
+    private boolean isSignatureValid(String payload, String signature) {
+        if (signature == null) {
+            return false;
+        }
+        final String[] splits = signature.split("=");
+        if (splits.length != 2) {
+            return false;
+        }
+        final String givenSha = splits[1];
+        final String expectedSha = getSha1(payload + appSecret);
+        return expectedSha.equals(givenSha);
+    }
+
     @Override
     public void destroy() {
         if (producer != null) {
diff --git a/backend/components/facebook/connector/src/test/java/co/airy/core/sources/facebook/WebhookControllerTest.java b/backend/components/facebook/connector/src/test/java/co/airy/core/sources/facebook/WebhookControllerTest.java
index abf2bd4fae..916cb93d5f 100644
--- a/backend/components/facebook/connector/src/test/java/co/airy/core/sources/facebook/WebhookControllerTest.java
+++ b/backend/components/facebook/connector/src/test/java/co/airy/core/sources/facebook/WebhookControllerTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
@@ -21,6 +22,7 @@
 
 import java.util.List;
 
+import static co.airy.crypto.Signature.getSha1;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -45,6 +47,9 @@ class WebhookControllerTest {
     @Autowired
     private Stores stores;
 
+    @Value("${facebook.app-secret}")
+    private String appSecret;
+
     @BeforeAll
     static void beforeAll() throws Exception {
         kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, sourceFacebookEvents);
@@ -63,12 +68,22 @@ void beforeEach() {
     }
 
     @Test
-    void canAcceptAnything() throws Exception {
-        mvc.perform(post("/facebook").content("whatever")).andExpect(status().isOk());
+    void validatesSignature() throws Exception {
+        // Fails without signature header
+        mvc.perform(post("/facebook")
+                .header("x-hub-signature", "sha1=something")
+                .content("payload")).andExpect(status().isForbidden());
+
+        final String payload = "some payload";
+        final String signature = getSha1(payload + appSecret);
+
+        mvc.perform(post("/facebook")
+                .header("x-hub-signature", "sha1=" + signature)
+                .content(payload)).andExpect(status().isOk());
 
         List<String> records = kafkaTestHelper.consumeValues(1, sourceFacebookEvents.name());
 
         assertThat(records, hasSize(1));
-        assertEquals("whatever", records.get(0));
+        assertEquals(payload, records.get(0));
     }
 }
diff --git a/backend/components/rasa/src/main/java/co/airy/core/rasa_connector/models/MessageSend.java b/backend/components/rasa/src/main/java/co/airy/core/rasa_connector/models/MessageSend.java
index b26c359009..7f3c14ece1 100644
--- a/backend/components/rasa/src/main/java/co/airy/core/rasa_connector/models/MessageSend.java
+++ b/backend/components/rasa/src/main/java/co/airy/core/rasa_connector/models/MessageSend.java
@@ -16,7 +16,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
-
 public class MessageSend {
     private String message;
     private String sender;
diff --git a/backend/components/sources-api/src/main/java/co/airy/core/sources/api/Stores.java b/backend/components/sources-api/src/main/java/co/airy/core/sources/api/Stores.java
index 73958bad82..8ead3b1b5f 100644
--- a/backend/components/sources-api/src/main/java/co/airy/core/sources/api/Stores.java
+++ b/backend/components/sources-api/src/main/java/co/airy/core/sources/api/Stores.java
@@ -24,6 +24,7 @@
 import org.apache.kafka.streams.kstream.KStream;
 import org.apache.kafka.streams.kstream.KTable;
 import org.apache.kafka.streams.kstream.Materialized;
+import org.apache.kafka.streams.state.KeyValueIterator;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.actuate.health.Health;
@@ -170,7 +171,9 @@ public ChannelContainer getChannel(String id) {
     public List<ChannelContainer> getAllChannels() {
         final ReadOnlyKeyValueStore<String, ChannelContainer> store = getChannelsStore();
         final ArrayList<ChannelContainer> channels = new ArrayList<>();
-        store.all().forEachRemaining((record) -> channels.add(record.value));
+        try (KeyValueIterator<String, ChannelContainer> iterator = store.all()) {
+            iterator.forEachRemaining((record) -> channels.add(record.value));
+        }
         return channels;
     }
 
@@ -186,7 +189,9 @@ public Source getSource(String id) {
     public List<Source> getAllSources() {
         final ReadOnlyKeyValueStore<String, Source> store = getSourcesStore();
         final ArrayList<Source> sources = new ArrayList<>();
-        store.all().forEachRemaining((record) -> sources.add(record.value));
+        try (KeyValueIterator<String, Source> iterator = store.all()) {
+            iterator.forEachRemaining((record) -> sources.add(record.value));
+        }
         return sources;
     }
 
diff --git a/backend/components/unread-counter/BUILD b/backend/components/unread-counter/BUILD
new file mode 100644
index 0000000000..b00c9a3d28
--- /dev/null
+++ b/backend/components/unread-counter/BUILD
@@ -0,0 +1,49 @@
+load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
+load("//tools/build:springboot.bzl", "springboot")
+load("//tools/build:junit5.bzl", "junit5")
+load("//tools/build:container_release.bzl", "container_release")
+
+app_deps = [
+    "//backend:base_app",
+    "//:springboot_actuator",
+    "//:springboot_websocket",
+    "//backend/model/message",
+    "//backend/model/metadata",
+    "//backend:read-receipt",
+    "//lib/java/date",
+    "//lib/java/uuid",
+    "//lib/java/spring/auth:spring-auth",
+    "//lib/java/spring/web:spring-web",
+    "//lib/java/spring/kafka/core:spring-kafka-core",
+    "//lib/java/spring/kafka/streams:spring-kafka-streams",
+    "@maven//:org_springframework_security_spring_security_core",
+]
+
+springboot(
+    name = "unread-counter",
+    srcs = glob(["src/main/java/**/*.java"]),
+    main_class = "co.airy.spring.core.AirySpringBootApplication",
+    deps = app_deps,
+)
+
+[
+    junit5(
+        size = "medium",
+        file = file,
+        resources = glob(["src/test/resources/**/*"]),
+        deps = [
+            ":app",
+            "//backend:base_test",
+            "//lib/java/kafka/test:kafka-test",
+            "//lib/java/spring/test:spring-test",
+        ] + app_deps,
+    )
+    for file in glob(["src/test/java/**/*Test.java"])
+]
+
+container_release(
+    registry = "ghcr.io/airyhq/components",
+    repository = "unread-counter",
+)
+
+check_pkg(name = "buildifier")
diff --git a/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/Stores.java b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/Stores.java
new file mode 100644
index 0000000000..c1e703ad77
--- /dev/null
+++ b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/Stores.java
@@ -0,0 +1,126 @@
+package co.airy.core.unread_counter;
+
+import co.airy.avro.communication.Message;
+import co.airy.avro.communication.Metadata;
+import co.airy.avro.communication.ReadReceipt;
+import co.airy.avro.communication.ValueType;
+import co.airy.core.unread_counter.dto.CountAction;
+import co.airy.core.unread_counter.dto.UnreadCountState;
+import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
+import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
+import co.airy.kafka.schema.application.ApplicationCommunicationReadReceipts;
+import co.airy.kafka.streams.KafkaStreamsWrapper;
+import co.airy.model.metadata.MetadataKeys;
+import org.apache.avro.specific.SpecificRecordBase;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.streams.KeyValue;
+import org.apache.kafka.streams.StreamsBuilder;
+import org.apache.kafka.streams.kstream.KStream;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
+import static co.airy.model.message.MessageRepository.isNewMessage;
+import static co.airy.model.metadata.MetadataRepository.getId;
+import static co.airy.model.metadata.MetadataRepository.newConversationMetadata;
+import static co.airy.model.metadata.MetadataRepository.newMessageMetadata;
+import static java.util.stream.Collectors.toCollection;
+
+@Component
+public class Stores implements HealthIndicator, ApplicationListener<ApplicationStartedEvent>, DisposableBean {
+    private static final String appId = "UnreadCounterStores";
+
+    private final KafkaStreamsWrapper streams;
+    private final KafkaProducer<String, SpecificRecordBase> producer;
+
+    private final String applicationCommunicationMetadata = new ApplicationCommunicationMetadata().name();
+    private final String applicationCommunicationReadReceipts = new ApplicationCommunicationReadReceipts().name();
+
+    Stores(KafkaStreamsWrapper streams,
+           KafkaProducer<String, SpecificRecordBase> producer
+    ) {
+        this.streams = streams;
+        this.producer = producer;
+    }
+
+    private void startStream() {
+        final StreamsBuilder builder = new StreamsBuilder();
+
+        final KStream<String, Message> messageStream = builder.stream(new ApplicationCommunicationMessages().name());
+
+        final KStream<String, CountAction> resetStream = builder.<String, ReadReceipt>stream(applicationCommunicationReadReceipts)
+                .mapValues(readReceipt -> CountAction.reset(readReceipt.getReadDate()));
+
+        // produce unread count metadata
+        messageStream.filter((messageId, message) -> message != null && message.getIsFromContact() && isNewMessage(message))
+                .selectKey((messageId, message) -> message.getConversationId())
+                .mapValues(message -> CountAction.increment(message.getSentAt(), message.getId()))
+                .merge(resetStream)
+                .groupByKey()
+                .aggregate(UnreadCountState::new, (conversationId, countAction, unreadCountState) -> {
+                    if (countAction.getActionType().equals(CountAction.ActionType.INCREMENT)) {
+                        unreadCountState.getUnreadMessagesSentAt().put(countAction.getMessageId(), countAction.getTimestamp());
+                    } else {
+                        unreadCountState.markMessagesReadAfter(countAction.getTimestamp());
+                    }
+
+                    return unreadCountState.toBuilder().build();
+                }).toStream()
+                .flatMap((conversationId, unreadCountState) -> {
+                    final List<KeyValue<String, Metadata>> records = new ArrayList<>();
+
+                    final Metadata metadata = newConversationMetadata(conversationId, MetadataKeys.ConversationKeys.UNREAD_COUNT,
+                            unreadCountState.getUnreadCount().toString());
+                    metadata.setValueType(ValueType.number);
+                    records.add(KeyValue.pair(getId(metadata).toString(), metadata));
+
+                    records.addAll(unreadCountState.getMessagesReadAt().entrySet().stream().map((entry) -> {
+                        final Metadata messageMetadata = newMessageMetadata(entry.getKey(), MetadataKeys.MessageKeys.READ_BY_USER, entry.getValue().toString());
+                        messageMetadata.setValueType(ValueType.number);
+                        return KeyValue.pair(getId(messageMetadata).toString(), messageMetadata);
+                    }).collect(Collectors.toSet()));
+
+                    return records;
+                })
+                .to(applicationCommunicationMetadata);
+
+        streams.start(builder.build(), appId);
+    }
+
+    public void storeReadReceipt(ReadReceipt readReceipt) throws ExecutionException, InterruptedException {
+        producer.send(new ProducerRecord<>(applicationCommunicationReadReceipts, readReceipt.getConversationId(), readReceipt)).get();
+    }
+
+
+    @Override
+    public void destroy() {
+        if (streams != null) {
+            streams.close();
+        }
+    }
+
+    @Override
+    public void onApplicationEvent(ApplicationStartedEvent event) {
+        startStream();
+    }
+
+    @Override
+    public Health health() {
+        if (streams == null || !streams.state().isRunningOrRebalancing()) {
+            return Health.down().build();
+        }
+        return Health.up().build();
+    }
+}
+
diff --git a/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/UnreadCounterController.java b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/UnreadCounterController.java
new file mode 100644
index 0000000000..07f7723466
--- /dev/null
+++ b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/UnreadCounterController.java
@@ -0,0 +1,40 @@
+package co.airy.core.unread_counter;
+
+import co.airy.avro.communication.ReadReceipt;
+import co.airy.core.unread_counter.payload.MarkReadRequestPayload;
+import co.airy.spring.web.payload.RequestErrorResponsePayload;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.time.Instant;
+
+@RestController
+public class UnreadCounterController {
+    private final Stores stores;
+
+    UnreadCounterController(Stores stores) throws IOException {
+        this.stores = stores;
+    }
+
+    @PostMapping({"/conversations.markRead", "/conversations.mark-read"})
+    ResponseEntity<?> conversationMarkRead(@RequestBody @Valid MarkReadRequestPayload payload) {
+        final String conversationId = payload.getConversationId().toString();
+        final ReadReceipt readReceipt = ReadReceipt.newBuilder()
+                .setConversationId(conversationId)
+                .setReadDate(Instant.now().toEpochMilli())
+                .build();
+
+        try {
+            stores.storeReadReceipt(readReceipt);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new RequestErrorResponsePayload(e.getMessage()));
+        }
+
+        return ResponseEntity.noContent().build();
+    }
+}
diff --git a/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/dto/CountAction.java b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/dto/CountAction.java
new file mode 100644
index 0000000000..03efb0ddcd
--- /dev/null
+++ b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/dto/CountAction.java
@@ -0,0 +1,29 @@
+package co.airy.core.unread_counter.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CountAction implements Serializable {
+    public enum ActionType {
+        INCREMENT,
+        RESET
+    }
+
+    private ActionType actionType;
+    private long timestamp;
+    private String messageId;
+
+    public static CountAction reset(long timestamp) {
+        return new CountAction(ActionType.RESET, timestamp, null);
+    }
+
+    public static CountAction increment(long timestamp, String messageId) {
+        return new CountAction(ActionType.INCREMENT, timestamp, messageId);
+    }
+}
diff --git a/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/dto/UnreadCountState.java b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/dto/UnreadCountState.java
new file mode 100644
index 0000000000..84abcaeea9
--- /dev/null
+++ b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/dto/UnreadCountState.java
@@ -0,0 +1,56 @@
+package co.airy.core.unread_counter.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class UnreadCountState implements Serializable {
+    @Builder.Default
+    private Map<String, Long> unreadMessagesSentAt = new HashMap<>();
+    // TODO this can grow without bounds so records need to expire
+    @Builder.Default
+    private Map<String, Long> messagesReadAt = new HashMap<>();
+
+    @JsonIgnore
+    public Integer getUnreadCount() {
+        return unreadMessagesSentAt.size();
+    }
+
+    // Moves unread messages before the read date to the map of read messages
+    public void markMessagesReadAfter(long timestamp) {
+        this.cleanUpReadMap(timestamp);
+
+        for (Map.Entry<String, Long> entry : unreadMessagesSentAt.entrySet()) {
+            if (entry.getValue() < timestamp) {
+                messagesReadAt.put(entry.getKey(), entry.getValue());
+                unreadMessagesSentAt.remove(entry.getKey());
+            }
+        }
+    }
+
+    /*
+     Records in messagesReadAt needs to expire for two reasons:
+     - Aggregation objects can exceed producer write buffer if they grow unboundedly
+     - We would keep writing user_read metadata for each message indefinitely
+
+     Expiry should optimally happen once we know the metadata has been produced once.
+     Ensuring this is not feasible with Kafka Streams so we opt for a conservative TTL (30s).
+    */
+    private void cleanUpReadMap(long timestamp) {
+        for (Map.Entry<String, Long> entry : messagesReadAt.entrySet()) {
+            if (timestamp - entry.getValue() > 30_000) {
+                messagesReadAt.remove(entry.getKey());
+            }
+        }
+    }
+}
diff --git a/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/payload/MarkReadRequestPayload.java b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/payload/MarkReadRequestPayload.java
new file mode 100644
index 0000000000..f5de7b0318
--- /dev/null
+++ b/backend/components/unread-counter/src/main/java/co/airy/core/unread_counter/payload/MarkReadRequestPayload.java
@@ -0,0 +1,17 @@
+package co.airy.core.unread_counter.payload;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.UUID;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MarkReadRequestPayload {
+    @NotNull
+    private UUID conversationId;
+}
+
diff --git a/backend/components/communication/src/test/java/co/airy/core/api/communication/UnreadCountTest.java b/backend/components/unread-counter/src/test/java/co/airy/core/unread_counter/UnreadCountTest.java
similarity index 52%
rename from backend/components/communication/src/test/java/co/airy/core/api/communication/UnreadCountTest.java
rename to backend/components/unread-counter/src/test/java/co/airy/core/unread_counter/UnreadCountTest.java
index b7512257cc..cc391b8a14 100644
--- a/backend/components/communication/src/test/java/co/airy/core/api/communication/UnreadCountTest.java
+++ b/backend/components/unread-counter/src/test/java/co/airy/core/unread_counter/UnreadCountTest.java
@@ -1,12 +1,14 @@
-package co.airy.core.api.communication;
+package co.airy.core.unread_counter;
 
-import co.airy.avro.communication.Channel;
-import co.airy.avro.communication.ChannelConnectionState;
 import co.airy.avro.communication.DeliveryState;
 import co.airy.avro.communication.Message;
-import co.airy.core.api.communication.util.TestConversation;
+import co.airy.avro.communication.Metadata;
+import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
+import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
+import co.airy.kafka.schema.application.ApplicationCommunicationReadReceipts;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.model.metadata.MetadataKeys;
 import co.airy.spring.core.AirySpringBootApplication;
 import co.airy.spring.test.WebTestHelper;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -26,13 +28,10 @@
 import java.util.List;
 import java.util.UUID;
 
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationChannels;
-import static co.airy.core.api.communication.util.Topics.applicationCommunicationMessages;
-import static co.airy.core.api.communication.util.Topics.getTopics;
+import static co.airy.model.metadata.MetadataRepository.getSubject;
 import static co.airy.test.Timing.retryOnException;
-import static org.hamcrest.core.Is.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AirySpringBootApplication.class)
@@ -48,9 +47,13 @@ class UnreadCountTest {
     @Autowired
     private WebTestHelper webTestHelper;
 
+    private static final ApplicationCommunicationMetadata applicationCommunicationMetadata = new ApplicationCommunicationMetadata();
+    private static final ApplicationCommunicationMessages applicationCommunicationMessages = new ApplicationCommunicationMessages();
+    private static final ApplicationCommunicationReadReceipts applicationCommunicationReadReceipts = new ApplicationCommunicationReadReceipts();
+
     @BeforeAll
     static void beforeAll() throws Exception {
-        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, getTopics());
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, applicationCommunicationMetadata, applicationCommunicationReadReceipts);
         kafkaTestHelper.beforeAll();
     }
 
@@ -66,48 +69,53 @@ void beforeEach() throws Exception {
 
     @Test
     void canResetUnreadCount() throws Exception {
-        final Channel channel = Channel.newBuilder()
-                .setConnectionState(ChannelConnectionState.CONNECTED)
-                .setId(UUID.randomUUID().toString())
-                .setSource("facebook")
-                .setSourceChannelId("ps-id")
-                .build();
-
-        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId(), channel));
-
         final String conversationId = UUID.randomUUID().toString();
-        final Integer unreadMessages = 3;
-
-        kafkaTestHelper.produceRecords(TestConversation.generateRecords(conversationId, channel, unreadMessages));
-
+        final String messageId = UUID.randomUUID().toString();
         // Messages from Airy should not increase the unread count
         kafkaTestHelper.produceRecords(List.of(
-                new ProducerRecord<>(applicationCommunicationMessages.name(), "message-id", Message.newBuilder()
-                        .setId("message-id")
+                new ProducerRecord<>(applicationCommunicationMessages.name(), messageId, Message.newBuilder()
+                        .setId(messageId)
                         .setSentAt(Instant.now().toEpochMilli())
                         .setSenderId("source-conversation-id")
                         .setDeliveryState(DeliveryState.DELIVERED)
                         .setSource("facebook")
                         .setConversationId(conversationId)
-                        .setChannelId(channel.getId())
+                        .setChannelId("channel-id")
                         .setContent("from airy")
-                        .setIsFromContact(false)
+                        .setIsFromContact(true)
                         .build())
         ));
 
         final String payload = "{\"conversation_id\":\"" + conversationId + "\"}";
 
-        retryOnException(() -> webTestHelper.post("/conversations.info", payload)
-                        .andExpect(status().isOk())
-                        .andExpect(jsonPath("$.metadata.unread_count", is(3.0))),
-                "Conversation not showing unread count");
+
+        retryOnException(
+                () -> {
+                    final List<Metadata> metadataList = kafkaTestHelper.consumeValues(1, applicationCommunicationMetadata.name());
+
+                    assertThat(metadataList.size(), equalTo(1));
+                    assertThat(metadataList.stream().anyMatch((metadata) ->
+                            metadata.getKey().equals(MetadataKeys.ConversationKeys.UNREAD_COUNT)
+                                    && metadata.getValue().equals("1")), equalTo(true));
+                },
+                "Conversation unread count not set");
 
         webTestHelper.post("/conversations.mark-read", payload).andExpect(status().isNoContent());
 
         retryOnException(
-                () -> webTestHelper.post("/conversations.info", payload)
-                        .andExpect(status().isOk())
-                        .andExpect(jsonPath("$.metadata.unread_count", equalTo(0.0))),
-                "Conversation unread count did not reset");
+                () -> {
+                    final List<Metadata> metadataList = kafkaTestHelper.consumeValues(2, applicationCommunicationMetadata.name());
+
+                    assertThat(metadataList.size(), equalTo(2));
+                    assertThat(metadataList.stream().anyMatch((metadata) ->
+                            metadata.getKey().equals(MetadataKeys.ConversationKeys.UNREAD_COUNT)
+                                    && metadata.getValue().equals("0")), equalTo(true));
+
+                    assertThat(metadataList.stream().anyMatch((metadata) ->
+                            metadata.getKey().equals(MetadataKeys.MessageKeys.READ_BY_USER) && getSubject(metadata).getNamespace().equals("message")
+                                    && getSubject(metadata).getIdentifier().equals(messageId)), equalTo(true));
+                },
+                "Conversation unread count not reset");
+
     }
 }
diff --git a/backend/components/unread-counter/src/test/resources/test.properties b/backend/components/unread-counter/src/test/resources/test.properties
new file mode 100644
index 0000000000..ad4bb6e28f
--- /dev/null
+++ b/backend/components/unread-counter/src/test/resources/test.properties
@@ -0,0 +1,6 @@
+kafka.cleanup=true
+kafka.commit-interval-ms=0
+kafka.cache.max.bytes=0
+kafka.delete.retention.ms=0
+
+logs.enabled=false
diff --git a/backend/components/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Consumer.java b/backend/components/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Consumer.java
index d6eee4edce..af5344416a 100644
--- a/backend/components/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Consumer.java
+++ b/backend/components/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Consumer.java
@@ -34,7 +34,7 @@ public class Consumer implements DisposableBean {
 
     @Scheduled(fixedDelay = 50)
     public void process() {
-        final Job job = consumer.reserveJob(10);
+        final Job job = consumer.reserveJob(30);
         if (job == null) {
             return;
         }
diff --git a/backend/components/webhook/consumer/src/test/java/co/airy/core/webhook/consumer/ConsumerTest.java b/backend/components/webhook/consumer/src/test/java/co/airy/core/webhook/consumer/ConsumerTest.java
index 0fdf1fc701..8d011aba6a 100644
--- a/backend/components/webhook/consumer/src/test/java/co/airy/core/webhook/consumer/ConsumerTest.java
+++ b/backend/components/webhook/consumer/src/test/java/co/airy/core/webhook/consumer/ConsumerTest.java
@@ -127,7 +127,7 @@ void canSendOutEvents() throws Exception {
         final Job job = new Job();
         job.setId(1);
         job.setData(bytes);
-        when(beanstalkConsumer.reserveJob(Mockito.anyLong())).thenReturn(job);
+        when(beanstalkConsumer.reserveJob(Mockito.anyLong())).thenReturn(job).thenReturn(null);
 
         retryOnException(() -> mockServer.verify(), "Endpoint was not called", 10_000);
     }
diff --git a/backend/components/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Stores.java b/backend/components/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Stores.java
index 754e51ea20..e194195b62 100644
--- a/backend/components/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Stores.java
+++ b/backend/components/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Stores.java
@@ -24,6 +24,7 @@
 import org.apache.kafka.streams.kstream.KStream;
 import org.apache.kafka.streams.kstream.KTable;
 import org.apache.kafka.streams.kstream.Materialized;
+import org.apache.kafka.streams.state.KeyValueIterator;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.actuate.health.Health;
@@ -129,7 +130,9 @@ public Collection<Webhook> getAllWebhooks() {
         final ReadOnlyKeyValueStore<String, Webhook> store = getWebhookStore();
 
         final ArrayList<Webhook> webhooks = new ArrayList<>();
-        store.all().forEachRemaining((it) -> webhooks.add(it.value));
+        try (KeyValueIterator<String, Webhook> iterator = store.all()) {
+            iterator.forEachRemaining((it) -> webhooks.add(it.value));
+        }
         return webhooks;
     }
 
diff --git a/backend/components/whatsapp/connector/BUILD b/backend/components/whatsapp/connector/BUILD
index bd55606ce9..c55a81df15 100644
--- a/backend/components/whatsapp/connector/BUILD
+++ b/backend/components/whatsapp/connector/BUILD
@@ -12,6 +12,8 @@ app_deps = [
     "//lib/java/uuid",
     "//lib/java/log",
     "//lib/java/tracking",
+    "//lib/java/spring/async:spring-async",
+    "//lib/java/crypto",
     "//lib/java/spring/web:spring-web",
     "//lib/java/spring/auth:spring-auth",
     "//lib/java/spring/kafka/core:spring-kafka-core",
diff --git a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/Connector.java b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/Connector.java
index 5d6bb8a0b2..8c871d8b2d 100644
--- a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/Connector.java
+++ b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/Connector.java
@@ -1,11 +1,13 @@
 package co.airy.core.sources.whatsapp;
 
+import co.airy.avro.communication.Channel;
 import co.airy.avro.communication.DeliveryState;
 import co.airy.avro.communication.Message;
 import co.airy.avro.communication.Metadata;
 import co.airy.core.sources.whatsapp.api.Api;
 import co.airy.core.sources.whatsapp.api.ApiException;
 import co.airy.core.sources.whatsapp.api.model.SendMessageResponse;
+import co.airy.core.sources.whatsapp.dto.MessageWithChannel;
 import co.airy.core.sources.whatsapp.dto.SendMessageRequest;
 import co.airy.log.AiryLoggerFactory;
 import co.airy.model.metadata.MetadataKeys;
@@ -16,6 +18,7 @@
 import org.apache.kafka.streams.KeyValue;
 import org.slf4j.Logger;
 import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
@@ -85,6 +88,11 @@ private boolean isMessageStale(Message message) {
         return ChronoUnit.SECONDS.between(Instant.ofEpochMilli(message.getSentAt()), Instant.now()) > messageStaleAfterSec;
     }
 
+    @Async("threadPoolTaskExecutor")
+    public void markMessageRead(MessageWithChannel messageWithChannel) {
+        api.markMessageRead(messageWithChannel.getSourceMessageId(), messageWithChannel.getChannel());
+    }
+
     @Bean
     public IgnoreAuthPattern ignoreAuthPattern() {
         return new IgnoreAuthPattern("/whatsapp");
diff --git a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/Stores.java b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/Stores.java
index c53cd337b8..439b046a10 100644
--- a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/Stores.java
+++ b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/Stores.java
@@ -6,12 +6,14 @@
 import co.airy.avro.communication.Message;
 import co.airy.avro.communication.Metadata;
 import co.airy.core.sources.whatsapp.dto.Conversation;
+import co.airy.core.sources.whatsapp.dto.MessageWithChannel;
 import co.airy.core.sources.whatsapp.dto.SendMessageRequest;
 import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
 import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
 import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
 import co.airy.kafka.streams.KafkaStreamsWrapper;
 import co.airy.model.channel.dto.ChannelContainer;
+import co.airy.model.metadata.MetadataKeys;
 import org.apache.avro.specific.SpecificRecordBase;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -31,6 +33,7 @@
 import java.util.concurrent.ExecutionException;
 
 import static co.airy.model.metadata.MetadataRepository.getId;
+import static co.airy.model.metadata.MetadataRepository.getSubject;
 
 @Service
 public class Stores implements ApplicationListener<ApplicationStartedEvent>, DisposableBean, HealthIndicator {
@@ -55,22 +58,41 @@ public void onApplicationEvent(ApplicationStartedEvent applicationStartedEvent)
         final StreamsBuilder builder = new StreamsBuilder();
 
         KStream<String, Channel> channelStream = builder.<String, Channel>stream(applicationCommunicationChannels);
+        final KStream<String, Metadata> metadataStream = builder.stream(applicationCommunicationMetadata);
 
-        channelStream.toTable(Materialized.as(channelsStore));
+        final KTable<String, Channel> channelsTable = channelStream
+                .filter((sourceChannelId, channel) -> "whatsapp".equals(channel.getSource()))
+                .toTable(Materialized.as(channelsStore));
 
         // Channels table
-        KTable<String, Channel> channelsTable = channelStream
+        KTable<String, Channel> connectedChannelsTable = channelStream
                 .filter((sourceChannelId, channel) -> "whatsapp".equals(channel.getSource())
                         && channel.getConnectionState().equals(ChannelConnectionState.CONNECTED)).toTable();
 
         // Whatsapp messaging stream by conversation-id
         final KStream<String, Message> messageStream = builder.<String, Message>stream(applicationCommunicationMessages)
-                .filter((messageId, message) -> message != null && "whatsapp".equals(message.getSource()))
-                .selectKey((messageId, message) -> message.getConversationId());
+                .filter((messageId, message) -> message != null && "whatsapp".equals(message.getSource()));
 
+        // Foreign key join on channels so that we have channels information for marking messages read
+        final KTable<String, MessageWithChannel> messagesWithChannel = messageStream.toTable().join(channelsTable, Message::getChannelId,
+                (message,    channel) -> MessageWithChannel.builder().channel(channel).message(message).build());
+
+        // Contact messages table for marking them as read
+        final KTable<String, MessageWithChannel> markMessageReadTable = metadataStream
+                .filter((id, metadata) -> metadata.getKey().equals(MetadataKeys.MessageKeys.Source.ID))
+                .groupBy((id, metadata) -> getSubject(metadata).getIdentifier())
+                .reduce((v1, v2) -> v2)
+                .join(messagesWithChannel, (metadata, messageWithChannel) ->
+                        messageWithChannel.toBuilder().sourceMessageId(metadata.getValue()).build());
+
+        metadataStream.filter((id, metadata) -> metadata.getKey().equals(MetadataKeys.MessageKeys.READ_BY_USER))
+                .selectKey((id, metadata) -> getSubject(metadata).getIdentifier())
+                .join(markMessageReadTable, (metadata, messageWithChannel) -> messageWithChannel)
+                .peek((messageId, messageWithChannel) -> connector.markMessageRead(messageWithChannel));
 
         // Context table
         final KTable<String, Conversation> contextTable = messageStream
+                .selectKey((messageId, message) -> message.getConversationId())
                 .groupByKey()
                 .aggregate(Conversation::new,
                         (conversationId, message, conversation) -> {
@@ -82,14 +104,16 @@ public void onApplicationEvent(ApplicationStartedEvent applicationStartedEvent)
 
                             return conversationBuilder.build();
                         })
-                .join(channelsTable, Conversation::getChannelId, (conversation, channel) -> conversation.toBuilder()
+                .join(connectedChannelsTable, Conversation::getChannelId, (conversation, channel) -> conversation.toBuilder()
                         .channelId(conversation.getChannelId())
                         .channel(channel)
                         .sourceConversationId(conversation.getSourceConversationId())
                         .build());
 
         // Send outbound messages
-        messageStream.filter((conversationId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
+        messageStream
+                .selectKey((messageId, message) -> message.getConversationId())
+                .filter((conversationId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
                 .join(contextTable, (message, conversation) -> new SendMessageRequest(conversation, message))
                 .flatMap((conversationId, sendMessageRequest) -> connector.sendMessage(sendMessageRequest))
                 .to((recordId, record, context) -> {
diff --git a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/WebhookController.java b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/WebhookController.java
index 848027c14a..15c3abbc3a 100644
--- a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/WebhookController.java
+++ b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/WebhookController.java
@@ -13,6 +13,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,16 +21,21 @@
 import java.util.Properties;
 import java.util.UUID;
 
+import static co.airy.crypto.Signature.getSha1;
+
 @RestController
 public class WebhookController implements DisposableBean {
     private final String sourceWhatsappEvents = new SourceWhatsappEvents().name();
     private final String webhookSecret;
+    private final String appSecret;
 
     private final Producer<String, String> producer;
 
     WebhookController(@Value("${kafka.brokers}") String brokers,
-                      @Value("${webhookSecret}") String webhookSecret) {
+                      @Value("${webhookSecret}") String webhookSecret,
+                      @Value("${appSecret}") String appSecret) {
         this.webhookSecret = webhookSecret;
+        this.appSecret = appSecret;
         final Properties props = new Properties();
 
         props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, brokers);
@@ -52,7 +58,11 @@ int verify(@RequestParam(value = "hub.challenge") int challenge, @RequestParam(v
     }
 
     @PostMapping("/whatsapp")
-    ResponseEntity<Void> accept(@RequestBody String event) {
+    ResponseEntity<Void> accept(@RequestBody String event, @RequestHeader("x-hub-signature") String signature) {
+        if (!isSignatureValid(event, signature)) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
+        }
+
         String requestId = UUID.randomUUID().toString();
         try {
             ProducerRecord<String, String> record = new ProducerRecord<>(sourceWhatsappEvents, requestId, event);
@@ -63,6 +73,19 @@ ResponseEntity<Void> accept(@RequestBody String event) {
         }
     }
 
+    private boolean isSignatureValid(String payload, String signature) {
+        if (signature == null) {
+            return false;
+        }
+        final String[] splits = signature.split("=");
+        if (splits.length != 2) {
+            return false;
+        }
+        final String givenSha = splits[1];
+        final String expectedSha = getSha1(payload + appSecret);
+        return expectedSha.equals(givenSha);
+    }
+
     @Override
     public void destroy() {
         if (producer != null) {
diff --git a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/api/Api.java b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/api/Api.java
index f45542183b..f0ca6eaf61 100644
--- a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/api/Api.java
+++ b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/api/Api.java
@@ -1,5 +1,6 @@
 package co.airy.core.sources.whatsapp.api;
 
+import co.airy.avro.communication.Channel;
 import co.airy.core.sources.whatsapp.api.model.LongLivingUserAccessToken;
 import co.airy.core.sources.whatsapp.api.model.SendMessageResponse;
 import co.airy.core.sources.whatsapp.dto.SendMessageRequest;
@@ -40,7 +41,7 @@ public class Api implements ApplicationListener<ApplicationReadyEvent> {
     private RestTemplate restTemplate;
 
     private static final String baseUrl = "https://graph.facebook.com/v14.0";
-    private static final String requestTemplate = baseUrl + "/%s/messages?access_token=%s";
+    private static final String messageTemplate = baseUrl + "/%s/messages?access_token=%s";
 
     private final HttpHeaders httpHeaders = new HttpHeaders();
     private final String appId;
@@ -72,13 +73,21 @@ public String exchangeToLongLivingUserAccessToken(String userAccessToken) throws
     public SendMessageResponse sendMessage(SendMessageRequest sendMessageRequest) throws JsonProcessingException {
         final String token = sendMessageRequest.getConversation().getChannel().getToken();
         final String phoneNumberId = sendMessageRequest.getConversation().getChannel().getSourceChannelId();
-        final JsonNode payload = mapper.fromSendMessageRequest(sendMessageRequest);
-        String reqUrl = String.format(requestTemplate, phoneNumberId, token);
+        final JsonNode payload = mapper.getSendMessageRequest(sendMessageRequest);
+        String reqUrl = String.format("%s/%s/messages?access_token=%s", baseUrl, phoneNumberId, token);
 
         final ResponseEntity<SendMessageResponse> responseEntity = restTemplate.postForEntity(reqUrl, new HttpEntity<>(payload, httpHeaders), SendMessageResponse.class);
         return responseEntity.getBody();
     }
 
+    public void markMessageRead(String whatsappMessageId, Channel channel) {
+        final String token = channel.getToken();
+        final String phoneNumberId = channel.getSourceChannelId();
+        final JsonNode payload = mapper.getMarkMessageReadRequest(whatsappMessageId);
+        String reqUrl = String.format("%s/%s/messages?access_token=%s", baseUrl, phoneNumberId, token);
+        restTemplate.postForEntity(reqUrl, new HttpEntity<>(payload, httpHeaders), SendMessageResponse.class);
+    }
+
     @Override
     public void onApplicationEvent(ApplicationReadyEvent event) {
         restTemplate = restTemplateBuilder
diff --git a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/api/Mapper.java b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/api/Mapper.java
index 955bdeac58..2121cc1b25 100644
--- a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/api/Mapper.java
+++ b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/api/Mapper.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -19,7 +20,7 @@ public Mapper(@Qualifier("metaObjectMapper") ObjectMapper objectMapper) {
         this.objectMapper = objectMapper;
     }
 
-    public JsonNode fromSendMessageRequest(SendMessageRequest sendMessageRequest) throws JsonProcessingException {
+    public JsonNode getSendMessageRequest(SendMessageRequest sendMessageRequest) throws JsonProcessingException {
         final Message message = sendMessageRequest.getMessage();
         final Conversation conversation = sendMessageRequest.getConversation();
         final ObjectNode payload = ((ObjectNode) objectMapper.readTree(message.getContent()));
@@ -28,4 +29,14 @@ public JsonNode fromSendMessageRequest(SendMessageRequest sendMessageRequest) th
         payload.put("to", conversation.getSourceConversationId());
         return payload;
     }
+
+    public JsonNode getMarkMessageReadRequest(String whatsappMessageId) {
+        final JsonNodeFactory jsonNodeFactory = JsonNodeFactory.instance;
+        final ObjectNode payload = jsonNodeFactory.objectNode();
+
+        payload.put("messaging_product", "whatsapp");
+        payload.put("status", "read");
+        payload.put("message_id", whatsappMessageId);
+        return payload;
+    }
 }
diff --git a/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/dto/MessageWithChannel.java b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/dto/MessageWithChannel.java
new file mode 100644
index 0000000000..ae64802ac8
--- /dev/null
+++ b/backend/components/whatsapp/connector/src/main/java/co/airy/core/sources/whatsapp/dto/MessageWithChannel.java
@@ -0,0 +1,20 @@
+package co.airy.core.sources.whatsapp.dto;
+
+import co.airy.avro.communication.Channel;
+import co.airy.avro.communication.Message;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class MessageWithChannel implements Serializable {
+    private String sourceMessageId;
+    private Message message;
+    private Channel channel;
+}
diff --git a/backend/components/whatsapp/connector/src/main/java/resources/application.properties b/backend/components/whatsapp/connector/src/main/java/resources/application.properties
new file mode 100644
index 0000000000..954beda302
--- /dev/null
+++ b/backend/components/whatsapp/connector/src/main/java/resources/application.properties
@@ -0,0 +1,3 @@
+thpool.core-pool-size=${REQUESTED_CPU}
+thpool.max-pool-size=${LIMIT_CPU}
+thpool.queue-capacity=${QUEUE_CAPACITY:0}
diff --git a/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/MarkReadTest.java b/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/MarkReadTest.java
new file mode 100644
index 0000000000..e1d777a880
--- /dev/null
+++ b/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/MarkReadTest.java
@@ -0,0 +1,143 @@
+package co.airy.core.sources.whatsapp;
+
+import co.airy.avro.communication.Channel;
+import co.airy.avro.communication.ChannelConnectionState;
+import co.airy.avro.communication.DeliveryState;
+import co.airy.avro.communication.Message;
+import co.airy.avro.communication.Metadata;
+import co.airy.core.sources.whatsapp.api.Api;
+import co.airy.core.sources.whatsapp.dto.MessageWithChannel;
+import co.airy.kafka.schema.Topic;
+import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
+import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
+import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
+import co.airy.kafka.test.KafkaTestHelper;
+import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.model.metadata.MetadataKeys;
+import co.airy.spring.core.AirySpringBootApplication;
+import co.airy.spring.test.WebTestHelper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static co.airy.model.metadata.MetadataRepository.getId;
+import static co.airy.model.metadata.MetadataRepository.newMessageMetadata;
+import static co.airy.test.Timing.retryOnException;
+import static org.apache.kafka.streams.KafkaStreams.State.RUNNING;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.doNothing;
+
+@SpringBootTest(classes = AirySpringBootApplication.class)
+@TestPropertySource(value = "classpath:test.properties")
+@AutoConfigureMockMvc
+@ExtendWith(SpringExtension.class)
+class MarkReadTest {
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
+    private WebTestHelper webTestHelper;
+
+    @RegisterExtension
+    public static final SharedKafkaTestResource sharedKafkaTestResource = new SharedKafkaTestResource();
+    private static KafkaTestHelper kafkaTestHelper;
+
+    private static final Topic applicationCommunicationChannels = new ApplicationCommunicationChannels();
+    private static final Topic applicationCommunicationMessages = new ApplicationCommunicationMessages();
+    private static final Topic applicationCommunicationMetadata = new ApplicationCommunicationMetadata();
+
+    @MockBean
+    private Api api;
+
+    @Autowired
+    @InjectMocks
+    private Connector connector;
+
+    @Autowired
+    private Stores stores;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource,
+                applicationCommunicationChannels,
+                applicationCommunicationMessages,
+                applicationCommunicationMetadata
+        );
+
+        kafkaTestHelper.beforeAll();
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        kafkaTestHelper.afterAll();
+    }
+
+    @BeforeEach
+    void beforeEach() throws Exception {
+        MockitoAnnotations.openMocks(this);
+        retryOnException(() -> assertEquals(RUNNING, stores.getStreamState()), "Failed to reach RUNNING state.");
+    }
+
+    @Test
+    void canMarkMessageRead() throws Exception {
+        final String messageId = UUID.randomUUID().toString();
+        final String channelId = UUID.randomUUID().toString();
+        final String whatsappMessageId = "whatsapp message id";
+        final Metadata metadata = newMessageMetadata(messageId, MetadataKeys.MessageKeys.Source.ID, whatsappMessageId);
+
+        final ArgumentCaptor<String> idCaptor = ArgumentCaptor.forClass(String.class);
+        doNothing().when(api).markMessageRead(idCaptor.capture(), Mockito.any(Channel.class));
+
+        kafkaTestHelper.produceRecords(List.of(
+                new ProducerRecord<>(applicationCommunicationMessages.name(), messageId, Message.newBuilder()
+                        .setId(messageId)
+                        .setSentAt(Instant.now().toEpochMilli())
+                        .setSenderId("source-conversation-id")
+                        .setDeliveryState(DeliveryState.DELIVERED)
+                        .setSource("whatsapp")
+                        .setConversationId("conversationId")
+                        .setHeaders(Map.of())
+                        .setChannelId(channelId)
+                        .setContent("hello world")
+                        .setIsFromContact(true)
+                        .build()),
+                new ProducerRecord<>(applicationCommunicationChannels.name(), channelId, Channel.newBuilder()
+                        .setToken("token")
+                        .setSourceChannelId("whatsapp-phone-number")
+                        .setSource("whatsapp")
+                        .setId(channelId)
+                        .setConnectionState(ChannelConnectionState.CONNECTED)
+                        .build()
+                ),
+                new ProducerRecord<>(applicationCommunicationMetadata.name(), getId(metadata).toString(), metadata)));
+
+        retryOnException(() -> {
+            final Metadata userReadMetadata = newMessageMetadata(messageId, MetadataKeys.MessageKeys.READ_BY_USER, String.valueOf(Instant.now().toEpochMilli()));
+            kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationMetadata.name(), getId(userReadMetadata).toString(), userReadMetadata));
+            final String actualMessageId = idCaptor.getValue();
+            assertEquals(actualMessageId, whatsappMessageId);
+        }, "message was not marked read");
+    }
+}
diff --git a/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/SendMessageTest.java b/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/SendMessageTest.java
index b012d8f281..08599db190 100644
--- a/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/SendMessageTest.java
+++ b/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/SendMessageTest.java
@@ -114,7 +114,7 @@ void canSendMessage() throws Exception {
         kafkaTestHelper.produceRecords(List.of(
                 new ProducerRecord<>(applicationCommunicationChannels.name(), channelId, Channel.newBuilder()
                         .setToken(token)
-                        .setSourceChannelId("ps-id")
+                        .setSourceChannelId("whatsapp phone number")
                         .setSource("whatsapp")
                         .setId(channelId)
                         .setConnectionState(ChannelConnectionState.CONNECTED)
@@ -166,6 +166,7 @@ void canSendMessage() throws Exception {
                                 .build())
         ));
 
+        // TimeUnit.SECONDS.sleep(5);
 
         final List<Metadata> metadataList = kafkaTestHelper.consumeValues(2, applicationCommunicationMetadata.name());
 
diff --git a/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/WebhookControllerTest.java b/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/WebhookControllerTest.java
index 8d004f3414..49db604b72 100644
--- a/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/WebhookControllerTest.java
+++ b/backend/components/whatsapp/connector/src/test/java/co/airy/core/sources/whatsapp/WebhookControllerTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
@@ -21,6 +22,7 @@
 
 import java.util.List;
 
+import static co.airy.crypto.Signature.getSha1;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -45,6 +47,9 @@ class WebhookControllerTest {
     @Autowired
     private Stores stores;
 
+    @Value("${appSecret}")
+    private String appSecret;
+
     @BeforeAll
     static void beforeAll() throws Exception {
         kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, sourceWhatsappEvents);
@@ -62,12 +67,22 @@ void beforeEach() {
     }
 
     @Test
-    void canAcceptAnything() throws Exception {
-        mvc.perform(post("/whatsapp").content("whatever")).andExpect(status().isOk());
+    void validatesSignature() throws Exception {
+        // Fails without signature header
+        mvc.perform(post("/whatsapp")
+                .header("x-hub-signature", "sha1=something")
+                .content("payload")).andExpect(status().isForbidden());
+
+        final String payload = "some payload";
+        final String signature = getSha1(payload + appSecret);
+
+        mvc.perform(post("/whatsapp")
+                .header("x-hub-signature", "sha1=" + signature)
+                .content(payload)).andExpect(status().isOk());
 
         List<String> records = kafkaTestHelper.consumeValues(1, sourceWhatsappEvents.name());
 
         assertThat(records, hasSize(1));
-        assertEquals("whatever", records.get(0));
+        assertEquals(payload, records.get(0));
     }
 }
diff --git a/backend/components/whatsapp/connector/src/test/resources/test.properties b/backend/components/whatsapp/connector/src/test/resources/test.properties
index 88b7b6c83e..c9eea2e61b 100644
--- a/backend/components/whatsapp/connector/src/test/resources/test.properties
+++ b/backend/components/whatsapp/connector/src/test/resources/test.properties
@@ -1,5 +1,10 @@
 kafka.cleanup=true
 logs.enabled=false
+thpool.core-pool-size=1
+thpool.max-pool-size=1
+thpool.queue-capacity=1
+
+
 appId=12345
 appSecret=secret
 webhookSecret=secret
diff --git a/backend/model/contacts/BUILD b/backend/model/contact/BUILD
similarity index 81%
rename from backend/model/contacts/BUILD
rename to backend/model/contact/BUILD
index eb9858919e..9a018fd1a9 100644
--- a/backend/model/contacts/BUILD
+++ b/backend/model/contact/BUILD
@@ -2,8 +2,8 @@ load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
 load("//tools/build:java_library.bzl", "custom_java_library")
 
 custom_java_library(
-    name = "contacts",
-    srcs = glob(["src/main/java/co/airy/model/contacts/**/*.java"]),
+    name = "contact",
+    srcs = glob(["src/main/java/co/airy/model/contact/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
         "//:jackson",
diff --git a/backend/model/contacts/src/main/java/co/airy/model/contacts/Contact.java b/backend/model/contact/src/main/java/co/airy/model/contact/Contact.java
similarity index 93%
rename from backend/model/contacts/src/main/java/co/airy/model/contacts/Contact.java
rename to backend/model/contact/src/main/java/co/airy/model/contact/Contact.java
index 6238c8c134..1b559f6d76 100644
--- a/backend/model/contacts/src/main/java/co/airy/model/contacts/Contact.java
+++ b/backend/model/contact/src/main/java/co/airy/model/contact/Contact.java
@@ -1,4 +1,4 @@
-package co.airy.model.contacts;
+package co.airy.model.contact;
 
 import co.airy.avro.communication.Metadata;
 import co.airy.log.AiryLoggerFactory;
@@ -27,19 +27,19 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static co.airy.model.contacts.MetadataRepository.newContactMetadata;
-import static co.airy.model.contacts.Contact.MetadataKeys.ADDRESS;
-import static co.airy.model.contacts.Contact.MetadataKeys.AVATAR_URL;
-import static co.airy.model.contacts.Contact.MetadataKeys.CONVERSATIONS;
-import static co.airy.model.contacts.Contact.MetadataKeys.CREATED_AT;
-import static co.airy.model.contacts.Contact.MetadataKeys.DISPLAY_NAME;
-import static co.airy.model.contacts.Contact.MetadataKeys.GENDER;
-import static co.airy.model.contacts.Contact.MetadataKeys.LOCALE;
-import static co.airy.model.contacts.Contact.MetadataKeys.ORGANIZATION_NAME;
-import static co.airy.model.contacts.Contact.MetadataKeys.MERGE_HISTORY;
-import static co.airy.model.contacts.Contact.MetadataKeys.TIMEZONE;
-import static co.airy.model.contacts.Contact.MetadataKeys.TITLE;
-import static co.airy.model.contacts.Contact.MetadataKeys.VIA;
+import static co.airy.model.contact.MetadataRepository.newContactMetadata;
+import static co.airy.model.contact.Contact.MetadataKeys.ADDRESS;
+import static co.airy.model.contact.Contact.MetadataKeys.AVATAR_URL;
+import static co.airy.model.contact.Contact.MetadataKeys.CONVERSATIONS;
+import static co.airy.model.contact.Contact.MetadataKeys.CREATED_AT;
+import static co.airy.model.contact.Contact.MetadataKeys.DISPLAY_NAME;
+import static co.airy.model.contact.Contact.MetadataKeys.GENDER;
+import static co.airy.model.contact.Contact.MetadataKeys.LOCALE;
+import static co.airy.model.contact.Contact.MetadataKeys.ORGANIZATION_NAME;
+import static co.airy.model.contact.Contact.MetadataKeys.MERGE_HISTORY;
+import static co.airy.model.contact.Contact.MetadataKeys.TIMEZONE;
+import static co.airy.model.contact.Contact.MetadataKeys.TITLE;
+import static co.airy.model.contact.Contact.MetadataKeys.VIA;
 import static co.airy.model.metadata.MetadataRepository.getSubject;
 import static java.util.stream.Collectors.toMap;
 
diff --git a/backend/model/contacts/src/main/java/co/airy/model/contacts/ConversationContact.java b/backend/model/contact/src/main/java/co/airy/model/contact/ConversationContact.java
similarity index 92%
rename from backend/model/contacts/src/main/java/co/airy/model/contacts/ConversationContact.java
rename to backend/model/contact/src/main/java/co/airy/model/contact/ConversationContact.java
index e7ba65c989..f1a4132afa 100644
--- a/backend/model/contacts/src/main/java/co/airy/model/contacts/ConversationContact.java
+++ b/backend/model/contact/src/main/java/co/airy/model/contact/ConversationContact.java
@@ -1,4 +1,4 @@
-package co.airy.model.contacts;
+package co.airy.model.contact;
 
 import co.airy.model.conversation.Conversation;
 import co.airy.model.metadata.dto.MetadataMap;
diff --git a/backend/model/contacts/src/main/java/co/airy/model/contacts/MetadataRepository.java b/backend/model/contact/src/main/java/co/airy/model/contact/MetadataRepository.java
similarity index 94%
rename from backend/model/contacts/src/main/java/co/airy/model/contacts/MetadataRepository.java
rename to backend/model/contact/src/main/java/co/airy/model/contact/MetadataRepository.java
index b467a48346..872a488c5a 100644
--- a/backend/model/contacts/src/main/java/co/airy/model/contacts/MetadataRepository.java
+++ b/backend/model/contact/src/main/java/co/airy/model/contact/MetadataRepository.java
@@ -1,4 +1,4 @@
-package co.airy.model.contacts;
+package co.airy.model.contact;
 
 import co.airy.avro.communication.Metadata;
 import co.airy.model.metadata.Subject;
diff --git a/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataKeys.java b/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataKeys.java
index 8b4937e7e8..a9979021f8 100644
--- a/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataKeys.java
+++ b/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataKeys.java
@@ -48,6 +48,7 @@ public static class MessageKeys {
         public static final String SUGGESTIONS = "suggestions";
         public static final String ERROR = "error";
         public static final String LANGUAGE = "language";
+        public static final String READ_BY_USER = "user_read"; // Indicates whether an Airy user has read this message
 
         public static class Source {
             public static final String ID = "source.id";
diff --git a/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataRepository.java b/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataRepository.java
index efad2b8d54..dc855fcd30 100644
--- a/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataRepository.java
+++ b/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataRepository.java
@@ -7,10 +7,6 @@
 import java.util.UUID;
 
 public class MetadataRepository {
-    public interface MetadataConstructor {
-        Metadata apply(String id, String key, String value);
-    }
-
     public static Metadata newConversationMetadata(String conversationId, String key, String value) {
         return Metadata.newBuilder()
                 .setSubject(new Subject("conversation", conversationId).toString())
diff --git a/cli/pkg/cmd/create/create.go b/cli/pkg/cmd/create/create.go
index 08df0aa44c..4ae4bcb5cb 100644
--- a/cli/pkg/cmd/create/create.go
+++ b/cli/pkg/cmd/create/create.go
@@ -2,18 +2,14 @@ package create
 
 import (
 	"cli/pkg/console"
-	"cli/pkg/helm"
 	"cli/pkg/providers"
 	"cli/pkg/workspace"
 	"fmt"
 	"os"
 	"runtime"
 
-	"github.com/airyhq/airy/lib/go/k8s"
-
 	"github.com/TwinProduction/go-color"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"gopkg.in/segmentio/analytics-go.v3"
 )
 
@@ -88,69 +84,9 @@ func create(cmd *cobra.Command, args []string) {
 	fmt.Fprintln(w)
 	fmt.Fprintln(w, providerName, "provider output:")
 	fmt.Fprintln(w)
-	context, err := provider.Provision(providerConfig, workspace.ConfigDir{Path: installDir})
+	err = provider.Provision(providerConfig, workspace.ConfigDir{Path: installDir})
 	fmt.Fprintln(w)
 	if err != nil {
 		console.Exit("could not install Airy: ", err)
 	}
-	if providerName == "minikube" { // TEMP fix to keep minikube working
-		clientset, err := context.GetClientSet()
-		if err != nil {
-			console.Exit("could not get clientset: ", err)
-		}
-
-		if err = context.Store(); err != nil {
-			console.Exit("could not store the kube context: ", err)
-		}
-
-		helm := helm.New(clientset, version, namespace, dir.GetAiryYaml())
-		if err := helm.Setup(); err != nil {
-			console.Exit("setting up Helm failed with err: ", err)
-		}
-
-		fmt.Println("🚀 Starting core with default components")
-
-		if err := helm.InstallCharts(); err != nil {
-			console.Exit("installing Helm charts failed with err: ", err)
-		}
-
-		if err = provider.PostInstallation(providerConfig, namespace, dir); err != nil {
-			console.Exit("failed to run post installation hook: ", err)
-		}
-
-		fmt.Println("🎉 Your Airy Core is ready")
-
-		coreConfig, err := k8s.GetCmData("core-config", namespace, clientset)
-		if err != nil {
-			console.Exit("failed to get hosts from installation")
-		}
-
-		fmt.Println("\t 👩‍🍳 Available hosts:")
-		for hostName, host := range coreConfig {
-			switch hostName {
-			case "HOST":
-				fmt.Printf("\t\t %s:\t %s", "Host", host)
-				fmt.Println()
-			case "API_HOST":
-				fmt.Printf("\t\t %s:\t %s", "API", host)
-				fmt.Println()
-			case "NGROK":
-				fmt.Printf("\t\t %s:\t %s", "NGROK", host)
-				fmt.Println()
-			}
-		}
-
-		fmt.Println("✅ Airy Installed")
-		fmt.Println()
-
-		viper.Set("provider", provider)
-		viper.Set("namespace", namespace)
-		viper.WriteConfig()
-
-		airyAnalytics.Track(analytics.Track{
-			UserId: coreConfig["CORE_ID"],
-			Event:  "installation_succesful"})
-		fmt.Printf("📚 For more information about the %s provider visit https://airy.co/docs/core/getting-started/installation/%s", providerName, providerName)
-		fmt.Println()
-	}
 }
diff --git a/cli/pkg/cmd/status/BUILD b/cli/pkg/cmd/status/BUILD
index 1e6e15a3c4..19f89229a3 100644
--- a/cli/pkg/cmd/status/BUILD
+++ b/cli/pkg/cmd/status/BUILD
@@ -11,7 +11,6 @@ go_library(
         "//lib/go/httpclient",
         "@com_github_spf13_cobra//:cobra",
         "@com_github_spf13_viper//:viper",
-        "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
     ],
 )
 
diff --git a/cli/pkg/providers/aws/BUILD b/cli/pkg/providers/aws/BUILD
index 52c3173890..bba406d29b 100644
--- a/cli/pkg/providers/aws/BUILD
+++ b/cli/pkg/providers/aws/BUILD
@@ -17,6 +17,7 @@ go_library(
         "//cli/pkg/kube",
         "//cli/pkg/workspace",
         "//cli/pkg/workspace/template",
+        "//lib/go/tools",
         "@com_github_hashicorp_go_getter//:go-getter",
         "@in_gopkg_segmentio_analytics_go_v3//:analytics-go_v3",
     ],
diff --git a/cli/pkg/providers/aws/aws.go b/cli/pkg/providers/aws/aws.go
index ad90420bb3..8d817749ae 100644
--- a/cli/pkg/providers/aws/aws.go
+++ b/cli/pkg/providers/aws/aws.go
@@ -2,22 +2,19 @@ package aws
 
 import (
 	"cli/pkg/console"
-	"cli/pkg/kube"
 	"cli/pkg/workspace"
 	tmpl "cli/pkg/workspace/template"
 	"io"
-	"math/rand"
 	"os"
 	"os/exec"
 	"strings"
-	"time"
+
+	"github.com/airyhq/airy/lib/go/tools"
 
 	getter "github.com/hashicorp/go-getter"
 	"gopkg.in/segmentio/analytics-go.v3"
 )
 
-var letters = []rune("abcdefghijklmnopqrstuvwxyz")
-
 type provider struct {
 	w         io.Writer
 	analytics console.AiryAnalytics
@@ -68,15 +65,14 @@ type KubeConfig struct {
 	CertificateData string
 }
 
-func (p *provider) Provision(providerConfig map[string]string, dir workspace.ConfigDir) (kube.KubeCtx, error) {
+func (p *provider) Provision(providerConfig map[string]string, dir workspace.ConfigDir) error {
 	installPath := dir.GetPath(".")
-	id := RandString(8)
+	id := tools.RandString(8)
 	p.analytics.Track(analytics.Identify{
 		AnonymousId: id,
 		Traits: analytics.NewTraits().
 			Set("provider", "AWS"),
 	})
-	name := "Airy-" + id
 	cmd := exec.Command("/bin/bash", "install.sh")
 	cmd.Dir = installPath
 	cmd.Stdin = os.Stdin
@@ -87,18 +83,5 @@ func (p *provider) Provision(providerConfig map[string]string, dir workspace.Con
 	if err != nil {
 		console.Exit("Error with Terraform installation", err)
 	}
-	ctx := kube.KubeCtx{
-		KubeConfigPath: "./kube.conf", // change this into a CLI
-		ContextName:    name,
-	}
-	return ctx, nil
-}
-
-func RandString(n int) string {
-	rand.Seed(time.Now().UnixNano())
-	b := make([]rune, n)
-	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
-	}
-	return string(b)
+	return nil
 }
diff --git a/cli/pkg/providers/minikube/BUILD b/cli/pkg/providers/minikube/BUILD
index 79fd961ece..a6d281a6a9 100644
--- a/cli/pkg/providers/minikube/BUILD
+++ b/cli/pkg/providers/minikube/BUILD
@@ -10,8 +10,8 @@ go_library(
         "//cli/pkg/kube",
         "//cli/pkg/workspace",
         "//cli/pkg/workspace/template",
+        "//lib/go/tools",
+        "@com_github_hashicorp_go_getter//:go-getter",
         "@in_gopkg_segmentio_analytics_go_v3//:analytics-go_v3",
-        "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
-        "@io_k8s_client_go//util/homedir:go_default_library",
     ],
 )
diff --git a/cli/pkg/providers/minikube/minikube.go b/cli/pkg/providers/minikube/minikube.go
index e08e9f4bea..1090272b03 100644
--- a/cli/pkg/providers/minikube/minikube.go
+++ b/cli/pkg/providers/minikube/minikube.go
@@ -5,17 +5,15 @@ import (
 	"cli/pkg/kube"
 	"cli/pkg/workspace"
 	"cli/pkg/workspace/template"
-	"context"
-	"fmt"
 	"io"
+	"os"
 	"os/exec"
-	"path/filepath"
-	"runtime"
 	"strings"
 
+	"github.com/airyhq/airy/lib/go/tools"
+
+	"github.com/hashicorp/go-getter"
 	"gopkg.in/segmentio/analytics-go.v3"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/util/homedir"
 )
 
 const (
@@ -45,114 +43,49 @@ func (p *provider) GetOverrides() template.Variables {
 }
 
 func (p *provider) CheckEnvironment() error {
-	return workspace.CheckBinaries([]string{"minikube"})
-}
-func (p *provider) PreInstallation(workspace string) (string, error) {
-	return workspace, nil
+	return workspace.CheckBinaries([]string{"minikube", "terraform"})
 }
-
-func (p *provider) Provision(providerConfig map[string]string, dir workspace.ConfigDir) (kube.KubeCtx, error) {
-	if err := p.startCluster(providerConfig); err != nil {
-		return kube.KubeCtx{}, err
+func (p *provider) PreInstallation(workspacePath string) (string, error) {
+	remoteUrl := "github.com/airyhq/airy/infrastructure/terraform/install"
+	installDir := workspacePath + "/terraform"
+	installFlags := strings.Join([]string{"PROVIDER=minikube", "WORKSPACE=" + workspacePath}, "\n")
+
+	var gitGetter = &getter.Client{
+		Src: remoteUrl,
+		Dst: installDir,
+		Dir: true,
 	}
-
-	homeDir := homedir.HomeDir()
-	if homeDir == "" {
-		return kube.KubeCtx{}, fmt.Errorf("could not find the kubeconfig")
+	if err := gitGetter.Get(); err != nil {
+		return "", err
 	}
-
-	ctx := kube.New(filepath.Join(homeDir, ".kube", "config"), profile)
-	p.context = ctx
-	return ctx, nil
-}
-
-func (p *provider) startCluster(providerConfig map[string]string) error {
-	minikubeDriver := getArg(providerConfig, "driver", "docker")
-	minikubeCpus := getArg(providerConfig, "cpus", "4")
-	minikubeMemory := getArg(providerConfig, "memory", "7168")
-	driverArg := "--driver=" + minikubeDriver
-	runtimeArg := ""
-	if minikubeDriver == "docker" {
-		runtimeArg = dockerRuntime
-	}
-	cpusArg := "--cpus=" + minikubeCpus
-	memoryArg := "--memory=" + minikubeMemory
-	args := []string{"start", "--extra-config=apiserver.service-node-port-range=1-65535", "--ports=80:80", driverArg, runtimeArg, cpusArg, memoryArg}
-	// Prevent minikube download progress bar from polluting the output by downloading silently first
-	_, err := runGetOutput(append(args, "--download-only")...)
+	err := os.WriteFile(installDir+"/install.flags", []byte(installFlags), 0666)
 	if err != nil {
-		return fmt.Errorf("downloading minikube files err: %v", err)
+		return "", err
 	}
-	return p.runPrintOutput(args...)
+	return installDir, nil
 }
 
-func (p *provider) runPrintOutput(args ...string) error {
-	cmd := getCmd(args...)
-	fmt.Fprintf(p.w, "$ %s %s", cmd.Path, strings.Join(cmd.Args, " "))
-	fmt.Fprintln(p.w)
-	fmt.Fprintln(p.w)
-	cmd.Stdout = p.w
+func (p *provider) Provision(providerConfig map[string]string, dir workspace.ConfigDir) error {
+	installPath := dir.GetPath(".")
+	id := tools.RandString(8)
+	p.analytics.Track(analytics.Identify{
+		AnonymousId: id,
+		Traits: analytics.NewTraits().
+			Set("provider", "Minikube"),
+	})
+	cmd := exec.Command("/bin/bash", "install.sh")
+	cmd.Dir = installPath
+	cmd.Stdin = os.Stdin
 	cmd.Stderr = p.w
-	return cmd.Run()
-}
+	cmd.Stdout = p.w
+	err := cmd.Run()
 
-func runGetOutput(args ...string) (string, error) {
-	cmd := getCmd(args...)
-	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return string(out), fmt.Errorf("running minikube failed with err: %v\n%v", err, string(out))
+		console.Exit("Error with Terraform installation", err)
 	}
-	return string(out), nil
-}
-
-func getCmd(args ...string) *exec.Cmd {
-	defaultArgs := []string{"--profile=" + profile}
-	return exec.Command(minikube, append(defaultArgs, args...)...)
+	return nil
 }
 
 func (p *provider) PostInstallation(providerConfig map[string]string, namespace string, dir workspace.ConfigDir) error {
-	clientset, err := p.context.GetClientSet()
-	if err != nil {
-		return err
-	}
-
-	configMaps := clientset.CoreV1().ConfigMaps(namespace)
-	configMap, err := configMaps.Get(context.TODO(), "core-config", metav1.GetOptions{})
-	if err != nil {
-		return err
-	}
-
-	// Ensure that kubectl is downloaded so that the progressbar does not pollute the output
-	runGetOutput("kubectl", "version")
-
-	coreId, err := runGetOutput("kubectl", "--", "get", "cm", "core-config", "-o", "jsonpath='{.data.CORE_ID}'")
-	if err != nil {
-		return err
-	}
-	coreId = strings.Trim(coreId, "'")
-
-	p.analytics.Track(analytics.Identify{
-		UserId: coreId,
-		Traits: analytics.NewTraits().
-			Set("provider", "minikube").
-			Set("numCpu", runtime.NumCPU()),
-	},
-	)
-
-	ngrokEndpoint := fmt.Sprintf("https://%s.tunnel.airy.co", coreId)
-
-	configMap.Data["NGROK"] = ngrokEndpoint
-	if _, err = configMaps.Update(context.TODO(), configMap, metav1.UpdateOptions{}); err != nil {
-		return err
-	}
-
 	return nil
 }
-
-func getArg(providerConfig map[string]string, key string, fallback string) string {
-	value := providerConfig[key]
-	if value == "" {
-		return fallback
-	}
-	return value
-}
diff --git a/cli/pkg/providers/provider.go b/cli/pkg/providers/provider.go
index a50841b76a..56faf0e4ba 100644
--- a/cli/pkg/providers/provider.go
+++ b/cli/pkg/providers/provider.go
@@ -2,7 +2,6 @@ package providers
 
 import (
 	"cli/pkg/console"
-	"cli/pkg/kube"
 	"cli/pkg/providers/aws"
 	"cli/pkg/providers/minikube"
 	"cli/pkg/workspace"
@@ -19,7 +18,7 @@ const (
 )
 
 type Provider interface {
-	Provision(providerConfig map[string]string, dir workspace.ConfigDir) (kube.KubeCtx, error)
+	Provision(providerConfig map[string]string, dir workspace.ConfigDir) error
 	GetOverrides() template.Variables
 	CheckEnvironment() error
 	PreInstallation(workspace string) (string, error)
diff --git a/docs/docs/api/endpoints/contacts.md b/docs/docs/api/endpoints/contacts.md
index 9600b58802..b06edce165 100644
--- a/docs/docs/api/endpoints/contacts.md
+++ b/docs/docs/api/endpoints/contacts.md
@@ -14,7 +14,8 @@ these contacts to your existing CRM solutions.
 
 :::note
 
-This feature is disabled by default. To enable it you need to set the `integration.contacts.enabled` field in your [airy.yaml config](getting-started/installation/configuration.md) to `true`.
+This feature is disabled by default. To enable it you need to set the `integration.contacts.enabled` field in
+your [airy.yaml config](getting-started/installation/configuration.md) to `true`.
 
 :::
 
@@ -38,14 +39,17 @@ All request fields are optional, but an empty payload will not be accepted.
   "display_name": "Barabara Liskov",
   "avatar_url": "https://example.org/avatar.jpg",
   "title": "Professor",
-  "timezone": "", // relative to GMT
-  "gender": "female", // female, male or any other value
+  "timezone": "",
+  // relative to GMT
+  "gender": "female",
+  // female, male or any other value
   "locale": "en_US",
   "organization_name": "Massachusetts Institute of Technology",
   "via": {
     "phone": "+1234567",
     "email": "b.liskov@mit.org",
-    "key": "value" // allows for any additional key and value (arrays are prohibited)
+    "key": "value"
+    // allows for any additional key and value (arrays are prohibited)
   },
   "address": {
     "organization_name": "Massachusetts Institute of Technology",
@@ -68,7 +72,8 @@ All request fields are optional, but an empty payload will not be accepted.
     },
     "salesforce_id": "ABC123",
     "zendesk_id": "XYZ789",
-    "key": "value" // allows for any additional key and value (arrays are prohibited)
+    "key": "value"
+    // allows for any additional key and value (arrays are prohibited)
   }
 }
 ```
@@ -79,6 +84,41 @@ import ContactResponsePayload from './contacts-response-payload.mdx'
 
 <ContactResponsePayload />
 
+### List recent messages
+
+`POST /contacts.recent-messages`
+
+**Sample request**
+
+```json5
+{
+  "contact_id": "id of the contact to query",
+  "include_sources": ["salesforce_history"],
+  // (optional) inclusive OR filter of sources to show
+  "page_size": 20, // (optional) pagination size
+  "cursors": {
+    // (optional)
+    "conversation-id": "conversation message list cursor"
+    // allows scrolling within the messages of a conversation
+  }
+}
+```
+
+**Sample response**
+
+```json5
+{
+  "conversation-id-1": {
+    "source": "salesforce_history",
+    "data": [],
+    // Same as for paginated message list https://airy.co/docs/core/api/endpoints/messages#list
+    "pagination_data": {}
+  },
+  "conversation-id-2": {}
+  // ...
+}
+```
+
 ### Import contacts
 
 `POST /contacts.import`
@@ -211,14 +251,16 @@ Get a single contact by contact or conversation id.
 
 `POST /contacts.update`
 
-All fields set on the [creation request](#create-contact) can be updated. To remove a field set it to the empty string `""`.
+All fields set on the [creation request](#create-contact) can be updated. To remove a field set it to the empty
+string `""`.
 
 **Sample request**
 
 ```json5
 {
   "id": "6b80b10c-ae6e-4995-844d-c56c4da11623",
-  "display_name": "Barbara Liskov" //
+  "display_name": "Barbara Liskov"
+  //
 }
 ```
 
diff --git a/docs/docs/api/webhook.md b/docs/docs/api/webhook.md
index 8e36e16da5..a69052fdd7 100644
--- a/docs/docs/api/webhook.md
+++ b/docs/docs/api/webhook.md
@@ -23,9 +23,9 @@ The outbound webhook integration enables you to programmatically participate in
 conversations by sending messages or reacting to them. Here's a common
 integration pattern:
 
-- Call the [subscribe](#subscribing) endpoint
+- Call the [`subscribe`](#subscribing) endpoint
 - Consume on your URL of choice [events](#events)
-- React to those events by calling the [send message](/api/endpoints/messages.md#send) endpoint
+- React to those events by calling the [`send message`](/api/endpoints/messages.md#send) endpoint
 
 You must de-duplicate messages on arrival as the webhook _does not_ guarantee
 events uniqueness. Your webhook also has to respond to every message with a status code of `200`.
diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
index d027718a1e..e613e90412 100644
--- a/docs/docs/changelog.md
+++ b/docs/docs/changelog.md
@@ -3,6 +3,102 @@ title: Changelog
 sidebar_label: 📝 Changelog
 ---
 
+## 0.50.0
+
+#### Changes
+
+- [[#3744](https://github.com/airyhq/airy/issues/3744)] Replace connect channel screen with modal [[#3798](https://github.com/airyhq/airy/pull/3798)]
+- [[#3648](https://github.com/airyhq/airy/issues/3648)] Added getMergedConnectors as useSelector [[#3780](https://github.com/airyhq/airy/pull/3780)]
+- [[#3589](https://github.com/airyhq/airy/issues/3589)] Remove the cache from the controller [[#3766](https://github.com/airyhq/airy/pull/3766)]
+- [[#3730](https://github.com/airyhq/airy/issues/3730)] Cypress connector update [[#3731](https://github.com/airyhq/airy/pull/3731)]
+- [[#2556](https://github.com/airyhq/airy/issues/2556)] Infrastructure/2556 google cloud platform terraform module [[#3717](https://github.com/airyhq/airy/pull/3717)]
+- [[#3485](https://github.com/airyhq/airy/issues/3485)] Enhanced Notify Me UX [[#3706](https://github.com/airyhq/airy/pull/3706)]
+- [[#3697](https://github.com/airyhq/airy/issues/3697)] Enhanced connectors card status experience [[#3702](https://github.com/airyhq/airy/pull/3702)]
+- [[#3699](https://github.com/airyhq/airy/issues/3699)] Allow customisation of repositories [[#3704](https://github.com/airyhq/airy/pull/3704)]
+- [[#3688](https://github.com/airyhq/airy/issues/3688)] Upgrade camelcase keys to v8 with necessary changes  [[#3698](https://github.com/airyhq/airy/pull/3698)]
+- [[#3680](https://github.com/airyhq/airy/issues/3680)] Control Center reorganize routing for catalog [[#3691](https://github.com/airyhq/airy/pull/3691)]
+- [[#3681](https://github.com/airyhq/airy/issues/3681)] Control Center: reorganize routing for Inbox component [[#3692](https://github.com/airyhq/airy/pull/3692)]
+- [[#3669](https://github.com/airyhq/airy/issues/3669)] Remove component naming types in the control center [[#3676](https://github.com/airyhq/airy/pull/3676)]
+
+#### 🚀 Features
+
+- [[#3701](https://github.com/airyhq/airy/issues/3701)] Contact messages endpoint [[#3789](https://github.com/airyhq/airy/pull/3789)]
+- [[#3641](https://github.com/airyhq/airy/issues/3641)] Added filtering to catalog view [[#3781](https://github.com/airyhq/airy/pull/3781)]
+- [[#3744](https://github.com/airyhq/airy/issues/3744)] Added possibility to configure channel connectors [[#3774](https://github.com/airyhq/airy/pull/3774)]
+- [[#3536](https://github.com/airyhq/airy/issues/3536)] Whatsapp mark messages read [[#3765](https://github.com/airyhq/airy/pull/3765)]
+- [[#3700](https://github.com/airyhq/airy/issues/3700)] Support the rendering of whatsapp cloud messages [[#3721](https://github.com/airyhq/airy/pull/3721)]
+- [[#3725](https://github.com/airyhq/airy/issues/3725)] Rendering of WhatsApp Cloud messages in the Conversation List Preview  [[#3726](https://github.com/airyhq/airy/pull/3726)]
+- [[#3708](https://github.com/airyhq/airy/issues/3708)] Sort status alphabetically [[#3712](https://github.com/airyhq/airy/pull/3712)]
+- [[#2757](https://github.com/airyhq/airy/issues/2757)] Use Terraform for Minikube provider [[#3555](https://github.com/airyhq/airy/pull/3555)]
+- [[#3667](https://github.com/airyhq/airy/issues/3667)] Added IBM and Amazon S3 to catalog [[#3707](https://github.com/airyhq/airy/pull/3707)]
+- [[#3485](https://github.com/airyhq/airy/issues/3485)] Add notify me catalog [[#3705](https://github.com/airyhq/airy/pull/3705)]
+
+#### 🐛 Bug Fixes
+
+- [[#3520](https://github.com/airyhq/airy/issues/3520)] Fix flaky webhook consumer test [[#3799](https://github.com/airyhq/airy/pull/3799)]
+- [[#3796](https://github.com/airyhq/airy/issues/3796)] Fix link topbar [[#3797](https://github.com/airyhq/airy/pull/3797)]
+- [[#3776](https://github.com/airyhq/airy/issues/3776)] Fix routing [[#3777](https://github.com/airyhq/airy/pull/3777)]
+- [[#3616](https://github.com/airyhq/airy/issues/3616)] Validate incoming facebook webhook signatures [[#3757](https://github.com/airyhq/airy/pull/3757)]
+- [[#3758](https://github.com/airyhq/airy/issues/3758)] Channels filter not appearing on the Inbox UI   [[#3759](https://github.com/airyhq/airy/pull/3759)]
+- [[#3723](https://github.com/airyhq/airy/issues/3723)] Sort catalog by installed, name, price [[#3729](https://github.com/airyhq/airy/pull/3729)]
+- [[#3469](https://github.com/airyhq/airy/issues/3469)] Removed animation contacts and added installed check [[#3716](https://github.com/airyhq/airy/pull/3716)]
+
+#### 📚 Documentation
+
+- [[#2754](https://github.com/airyhq/airy/issues/2754)] Improve installation and release docs [[#3733](https://github.com/airyhq/airy/pull/3733)]
+
+#### 🧰 Maintenance
+
+- Bump @types/node from 18.8.0 to 18.8.2 [[#3794](https://github.com/airyhq/airy/pull/3794)]
+- Bump typescript from 4.8.3 to 4.8.4 [[#3795](https://github.com/airyhq/airy/pull/3795)]
+- Bump cypress from 10.8.0 to 10.9.0 [[#3793](https://github.com/airyhq/airy/pull/3793)]
+- Bump @babel/preset-env from 7.19.1 to 7.19.3 [[#3790](https://github.com/airyhq/airy/pull/3790)]
+- Bump @types/dom-mediacapture-record from 1.0.11 to 1.0.13 [[#3791](https://github.com/airyhq/airy/pull/3791)]
+- Bump core-js from 3.25.3 to 3.25.5 [[#3792](https://github.com/airyhq/airy/pull/3792)]
+- Bump @bazel/typescript from 5.5.4 to 5.6.0 [[#3782](https://github.com/airyhq/airy/pull/3782)]
+- Bump @svgr/webpack from 6.3.1 to 6.4.0 [[#3786](https://github.com/airyhq/airy/pull/3786)]
+- Bump jest-environment-jsdom from 29.0.3 to 29.1.2 [[#3788](https://github.com/airyhq/airy/pull/3788)]
+- Bump babel-jest from 29.0.3 to 29.1.2 [[#3785](https://github.com/airyhq/airy/pull/3785)]
+- Bump @babel/core from 7.19.1 to 7.19.3 [[#3784](https://github.com/airyhq/airy/pull/3784)]
+- Bump @types/node from 18.7.21 to 18.8.0 [[#3783](https://github.com/airyhq/airy/pull/3783)]
+- Bump @types/node from 18.7.18 to 18.7.21 [[#3773](https://github.com/airyhq/airy/pull/3773)]
+- Bump core-js from 3.25.2 to 3.25.3 [[#3770](https://github.com/airyhq/airy/pull/3770)]
+- Bump react-router-dom from 6.4.0 to 6.4.1 [[#3771](https://github.com/airyhq/airy/pull/3771)]
+- Bump @types/react from 18.0.20 to 18.0.21 [[#3768](https://github.com/airyhq/airy/pull/3768)]
+- Bump sass from 1.54.9 to 1.55.0 [[#3769](https://github.com/airyhq/airy/pull/3769)]
+- Bump @babel/preset-env from 7.18.10 to 7.19.1 [[#3756](https://github.com/airyhq/airy/pull/3756)]
+- Bump webpack-dev-server from 4.10.1 to 4.11.1 [[#3754](https://github.com/airyhq/airy/pull/3754)]
+- Bump babel-jest from 29.0.1 to 29.0.3 [[#3752](https://github.com/airyhq/airy/pull/3752)]
+- Bump react-i18next from 11.18.5 to 11.18.6 [[#3755](https://github.com/airyhq/airy/pull/3755)]
+- Bump react-router-dom from 6.3.0 to 6.4.0 [[#3753](https://github.com/airyhq/airy/pull/3753)]
+- Bump @testing-library/dom from 8.18.0 to 8.18.1 [[#3747](https://github.com/airyhq/airy/pull/3747)]
+- Bump terser-webpack-plugin from 5.3.5 to 5.3.6 [[#3748](https://github.com/airyhq/airy/pull/3748)]
+- Bump emoji-mart from 5.2.1 to 5.2.2 [[#3750](https://github.com/airyhq/airy/pull/3750)]
+- Bump @babel/plugin-transform-spread from 7.18.9 to 7.19.0 [[#3751](https://github.com/airyhq/airy/pull/3751)]
+- Bump preact from 10.10.6 to 10.11.0 [[#3749](https://github.com/airyhq/airy/pull/3749)]
+- Bump @bazel/typescript from 5.5.3 to 5.5.4 [[#3736](https://github.com/airyhq/airy/pull/3736)]
+- Bump typescript from 4.8.2 to 4.8.3 [[#3740](https://github.com/airyhq/airy/pull/3740)]
+- Bump i18next from 21.9.1 to 21.9.2 [[#3745](https://github.com/airyhq/airy/pull/3745)]
+- Bump @types/node from 18.7.13 to 18.7.18 [[#3746](https://github.com/airyhq/airy/pull/3746)]
+- Bump @babel/core from 7.18.13 to 7.19.1 [[#3742](https://github.com/airyhq/airy/pull/3742)]
+- Bump core-js from 3.25.0 to 3.25.2 [[#3741](https://github.com/airyhq/airy/pull/3741)]
+- Bump @testing-library/dom from 8.17.1 to 8.18.0 [[#3739](https://github.com/airyhq/airy/pull/3739)]
+- Bump eslint-plugin-react from 7.31.1 to 7.31.8 [[#3737](https://github.com/airyhq/airy/pull/3737)]
+- Bump @emoji-mart/data from 1.0.5 to 1.0.6 [[#3738](https://github.com/airyhq/airy/pull/3738)]
+- Bump cypress from 10.6.0 to 10.8.0 [[#3734](https://github.com/airyhq/airy/pull/3734)]
+- Bump @types/react from 18.0.17 to 18.0.20 [[#3735](https://github.com/airyhq/airy/pull/3735)]
+- Bump @testing-library/react from 13.3.0 to 13.4.0 [[#3703](https://github.com/airyhq/airy/pull/3703)]
+- Bump sass from 1.54.5 to 1.54.9 [[#3710](https://github.com/airyhq/airy/pull/3710)]
+- Bump jest-environment-jsdom from 29.0.1 to 29.0.3 [[#3711](https://github.com/airyhq/airy/pull/3711)]
+
+#### Airy CLI
+
+You can download the Airy CLI for your operating system from the following links:
+
+[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.50.0/darwin/amd64/airy)
+[Linux](https://airy-core-binaries.s3.amazonaws.com/0.50.0/linux/amd64/airy)
+[Windows](https://airy-core-binaries.s3.amazonaws.com/0.50.0/windows/amd64/airy.exe)
+
 ## 0.49.0
 
 
@@ -1271,53 +1367,3 @@ You can download the Airy CLI for your operating system from the following links
 [Linux](https://airy-core-binaries.s3.amazonaws.com/0.30.0/linux/amd64/airy)
 [Windows](https://airy-core-binaries.s3.amazonaws.com/0.30.0/windows/amd64/airy.exe)
 
-## 0.29.0
-
-#### Changes
-
-- [[#2304](https://github.com/airyhq/airy/issues/2304)] Fixed broken link from Messages Send Section to Sources. [[#2307](https://github.com/airyhq/airy/pull/2307)]
-- [[#2308](https://github.com/airyhq/airy/issues/2308)] Chatplugin Customize Section Not Working [[#2309](https://github.com/airyhq/airy/pull/2309)]
-
-#### 🚀 Features
-
-- [[#2275](https://github.com/airyhq/airy/issues/2275)] Upgrade api-communication [[#2331](https://github.com/airyhq/airy/pull/2331)]
-- [[#2286](https://github.com/airyhq/airy/issues/2286)] Core upgrade scripts for 0.29.0 [[#2322](https://github.com/airyhq/airy/pull/2322)]
-- [[#2324](https://github.com/airyhq/airy/issues/2324)] Added more configs to the ui [[#2326](https://github.com/airyhq/airy/pull/2326)]
-- [[#2275](https://github.com/airyhq/airy/issues/2275)] Allow for multiple webhooks and event filtering [[#2286](https://github.com/airyhq/airy/pull/2286)]
-- [[#2243](https://github.com/airyhq/airy/issues/2243)] Introduce airy upgrade [[#2292](https://github.com/airyhq/airy/pull/2292)]
-- [[#2314](https://github.com/airyhq/airy/issues/2314)] fix docs + fix responsiveness of chatplugin [[#2315](https://github.com/airyhq/airy/pull/2315)]
-- [[#2279](https://github.com/airyhq/airy/issues/2279)] [[#2280](https://github.com/airyhq/airy/issues/2280)] More configs for chatplugin + docs [[#2301](https://github.com/airyhq/airy/pull/2301)]
-
-#### 🐛 Bug Fixes
-
-- [[#2282](https://github.com/airyhq/airy/issues/2282)] Hotfix for webhook registration health check [[#2284](https://github.com/airyhq/airy/pull/2284)]
-
-#### 🧰 Maintenance
-
-- Bump react-markdown from 6.0.3 to 7.0.0 [[#2317](https://github.com/airyhq/airy/pull/2317)]
-- Bump @types/react from 17.0.18 to 17.0.19 [[#2320](https://github.com/airyhq/airy/pull/2320)]
-- Bump webpack from 5.50.0 to 5.51.1 [[#2316](https://github.com/airyhq/airy/pull/2316)]
-- Bump @types/node from 16.6.1 to 16.7.1 [[#2318](https://github.com/airyhq/airy/pull/2318)]
-- Bump cypress from 8.1.0 to 8.3.0 [[#2311](https://github.com/airyhq/airy/pull/2311)]
-- Bump core-js from 3.16.1 to 3.16.2 [[#2312](https://github.com/airyhq/airy/pull/2312)]
-- Bump @types/react from 17.0.17 to 17.0.18 [[#2313](https://github.com/airyhq/airy/pull/2313)]
-- Bump react-markdown from 6.0.3 to 7.0.0 [[#2297](https://github.com/airyhq/airy/pull/2297)]
-- Bump @babel/core from 7.14.8 to 7.15.0 [[#2303](https://github.com/airyhq/airy/pull/2303)]
-- Bump sass from 1.37.5 to 1.38.0 [[#2306](https://github.com/airyhq/airy/pull/2306)]
-- Bump webpack from 5.49.0 to 5.50.0 [[#2302](https://github.com/airyhq/airy/pull/2302)]
-- Bump @typescript-eslint/parser from 4.29.1 to 4.29.2 [[#2295](https://github.com/airyhq/airy/pull/2295)]
-- Bump core-js from 3.16.0 to 3.16.1 [[#2298](https://github.com/airyhq/airy/pull/2298)]
-- Bump @types/node from 16.4.13 to 16.6.1 [[#2287](https://github.com/airyhq/airy/pull/2287)]
-- Bump @babel/preset-typescript from 7.14.5 to 7.15.0 [[#2288](https://github.com/airyhq/airy/pull/2288)]
-- Bump webpack-cli from 4.7.2 to 4.8.0 [[#2290](https://github.com/airyhq/airy/pull/2290)]
-- Bump @typescript-eslint/parser from 4.29.0 to 4.29.1 [[#2291](https://github.com/airyhq/airy/pull/2291)]
-- Bump url-parse from 1.5.1 to 1.5.3 [[#2268](https://github.com/airyhq/airy/pull/2268)]
-
-#### Airy CLI
-
-You can download the Airy CLI for your operating system from the following links:
-
-[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.29.0/darwin/amd64/airy)
-[Linux](https://airy-core-binaries.s3.amazonaws.com/0.29.0/linux/amd64/airy)
-[Windows](https://airy-core-binaries.s3.amazonaws.com/0.29.0/windows/amd64/airy.exe)
-
diff --git a/docs/docs/concepts/release-process.md b/docs/docs/concepts/release-process.md
index 15d541eb21..ee51b5898a 100644
--- a/docs/docs/concepts/release-process.md
+++ b/docs/docs/concepts/release-process.md
@@ -25,12 +25,11 @@ Once a release day comes, we execute the following steps:
   - `chmod +x airy`
 - We test the release using `./airy create --provider=minikube`.
 - We run the Cypress tests with the command `./node_modules/.bin/cypress open -C integration/cypress.config.ts`
-  Note that:
-  - Any additional hot-fix is committed directly to the release branch
-  - You must wait for all the images to be pushed via CI
-- We create the draft release which is used for the Changelog `./scripts/release.sh changelog x.y.z`.
-- Once we're satisfied with the release, we publish the release (we wait for the CI to complete before proceeding):
-  - We clean up the draft release. If the upgrade to the new version requires manual steps, we detail them.
+- Any additional fix is committed directly to the release branch. Then we must wait for all the images to be pushed via CI and test again.
+- Once we're satisfied with the release we execute the following steps:
+  - We create the draft release through the CI which used for the Changelog `./scripts/release.sh changelog x.y.z`.
+  - We clean up the draft release once it is there.
+  - If the upgrade to the new version requires manual steps, we detail them.
   - We run `./scripts/release.sh finish x.y.z`
   - We update the version string to `x.y.z` and the sha to `https://airy-core-binaries.s3.amazonaws.com/x.y.z/darwin/amd64/airy_darwin_sha256sum.txt` in the [Homebrew
     Formula](https://github.com/airyhq/homebrew-airy/blob/main/Formula/cli.rb)
diff --git a/docs/docs/getting-started/installation/aws.md b/docs/docs/getting-started/installation/aws.md
index 42903b2118..acc45b6f3e 100644
--- a/docs/docs/getting-started/installation/aws.md
+++ b/docs/docs/getting-started/installation/aws.md
@@ -19,7 +19,7 @@ The goal of this document is to provide an overview of how to run Airy Core on
 AWS cloud platform, using the [AWS Elastic Kubernetes
 Service](https://aws.amazon.com/eks/).
 
-## Configure AWS
+## Configure
 
 :::note
 
@@ -79,7 +79,7 @@ Refer to the following links for more information on AWS Service Limits:
 - [AWS Service Quotas](https://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html)
 - [AWS Well-Architected Framework Concepts](https://wa.aws.amazon.com/wellarchitected/2020-07-02T19-33-23/wat.concept.service-limits.en.html)
 
-## Create a cluster
+## Install
 
 To create the cluster you must setup your local AWS environment, by [configuring
 your local AWS
diff --git a/docs/docs/getting-started/installation/minikube.md b/docs/docs/getting-started/installation/minikube.md
index 6853e8c9b2..71f234fdf4 100644
--- a/docs/docs/getting-started/installation/minikube.md
+++ b/docs/docs/getting-started/installation/minikube.md
@@ -14,7 +14,7 @@ Run Airy on minikube with one command.
 The goal of this document is to provide an overview of how to run Airy Core on
 your local machine using [minikube](https://minikube.sigs.k8s.io/).
 
-## Create a minikube cluster
+## Install
 
 :::note
 
@@ -35,16 +35,16 @@ airy create --provider=minikube my-airy
 This will execute the following actions:
 
 1. Create the `my-airy` directory and populate it with the configuration that the CLI will need. All subsequent commands need to either be run from this directory or use the `--workspace` flag.
-2. Start a minikube cluster on your system and install Airy Core on it.
-3. Prints a URL for the `Airy Core` UI/APIs and another `ngrok` tunnel URL to connect your `Airy Core` instance to different [sources](../../sources/introduction.md) (see recording)
+2. Fetch the required Terraform modules in the `terraform` subdirectory, including the `install.sh` and `uninstall.sh` scripts.
+3. Run the `install.sh` script
+4. Start a minikube cluster on your system using Terraform, under the profile `airy-core`.
+5. Install the `Airy Core` helm chart on the minikube instance using Terraform (in a separate Terraform state then the minikube instance).
+6. Print the resulting URLs on which you can access the `Airy Core` installation and some additional information.
 
-import Script from "@site/src/components/Script";
-
-<Script data-cols="90" id="asciicast-NHuy672OHO4I4rvXMCZAG6H2P" src="https://asciinema.org/a/NHuy672OHO4I4rvXMCZAG6H2P.js"></Script>
-
-::: note
+:::note
 
 The base URL for the [API](../../api/introduction.md) is the same to access the UI through your browser.
+You can use the printed `ngrok` URL to connect to different [sources](../../sources/introduction.md) to the instance running on your local machine.
 
 :::
 
@@ -57,15 +57,18 @@ airy create --provider=minikube --provider-config driver=virtualbox,cpus=4,memor
 If you want to customize your `Airy Core` instance please see our [Configuration
 Section](configuration.md).
 
-After the installation, you can also interact with the components of `Airy Core` with the [kubectl](https://kubernetes.io/docs/tasks/tools/) command line utility.
-`airy create` adds the kubeconfig of your Airy Core instance to the default kubeconfig file `~/.kube/config`, under the context `airy-core`.
+After the installation, you can also interact with the components of `Airy Core` with the [kubectl](https://kubernetes.io/docs/tasks/tools/) command line utility. `airy create` creates the kubeconfig file `kube.conf` under the `terraform` directory in your workspace.
 
 :::note
 
-If the `airy create` command fails and you have installed a hypervisor for the first time, double-check that you have given it all the necessary permissions on your local machine.
+If the `airy create` command fails and you have installed a hypervisor for the first time, double-check that you have given it all the necessary permissions on your local machine. More information will be printed in the output from the Terraform installation.
 
 :::
 
+## Configure
+
+For more details on configuring your `Airy Core` instance please see our [Configuration Section](configuration.md). Under the `tools` section you can also find information on installing and activating third party tools for more detailed Kafka and data debugging.
+
 ## Integrate public webhooks
 
 In order to integrate with the webhook of most sources on your local machine, we
@@ -79,6 +82,7 @@ inside the Kubernetes cluster.
 To get the ngrok URL of your local Airy Core installation you can run:
 
 ```sh
+export KUBECONFIG=./terraform/kube.conf
 echo "https://$(minikube -p airy-core kubectl -- get cm core-config -o jsonpath='{.data.CORE_ID}').tunnel.airy.co"
 ```
 
@@ -115,15 +119,16 @@ description='Learn the Airy Basics with our Quick Start'
 link='getting-started/quickstart'
 />
 
-## Third party tools
+## Uninstall
 
-Third party tools can be activated in the `airy.yaml` configuration file, under the `tools` section.
-For more details please see our [Configuration Section](configuration.md).
+To uninstall `Airy Core` from AWS, run the `uninstall.sh` script located in the `WORKSPACE/terraform` directory. This script will run `terraform destroy` on both the `kubernetes` (minikube) and the `airy-core` state.
 
-## Uninstall Airy Core
+```
+cd terraform
+./uninstall.sh
+```
 
-You can remove the Airy Core minikube node from your machine completely running
-the following command:
+Deleting the minikube instance also removes Airy completely from your system:
 
 ```sh
 minikube -p airy-core delete
diff --git a/docs/docs/sources/whatsapp-cloud.md b/docs/docs/sources/whatsapp-cloud.md
index 9c1b9502cc..bfcf23c041 100644
--- a/docs/docs/sources/whatsapp-cloud.md
+++ b/docs/docs/sources/whatsapp-cloud.md
@@ -8,12 +8,6 @@ import SuccessBox from "@site/src/components/SuccessBox";
 import ButtonBox from "@site/src/components/ButtonBox";
 import useBaseUrl from '@docusaurus/useBaseUrl';
 
-:::warning
-
-This source is still under development. You can track the progress [here](https://github.com/airyhq/airy/milestone/38).
-
-:::
-
 <TLDR>
 
 Connect with **2 billion WhatsApp users** via messages and templates.
diff --git a/frontend/chat-plugin/lib/publish_package.json b/frontend/chat-plugin/lib/publish_package.json
index e50c145afb..2a184f42df 100644
--- a/frontend/chat-plugin/lib/publish_package.json
+++ b/frontend/chat-plugin/lib/publish_package.json
@@ -23,7 +23,7 @@
     "linkify-react": "^3.0.1",
     "react":  "18.1.0",
     "react-dom": "18.1.0",
-    "camelcase-keys": "7.0.0",
+    "camelcase-keys": "^8.0.2",
     "emoji-mart": "5.2.0",
     "@emoji-mart/data": "^1.0.3",
     "@emoji-mart/react": "^1.0.0"
diff --git a/frontend/chat-plugin/lib/src/components/chat/index.tsx b/frontend/chat-plugin/lib/src/components/chat/index.tsx
index e84f5c30a8..279457c691 100644
--- a/frontend/chat-plugin/lib/src/components/chat/index.tsx
+++ b/frontend/chat-plugin/lib/src/components/chat/index.tsx
@@ -22,8 +22,7 @@ import {CommandUnion, SourceMessage} from 'render';
 import {MessageWrapper} from 'components';
 import {Source} from 'model';
 
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 import {cyBubble, cyChatPluginMessageList, cyChatPluginEndChatModalButton} from 'chat-plugin-handles';
 import {getResumeTokenFromStorage, resetStorage} from '../../storage';
 import NewConversation from '../../components/newConversation';
diff --git a/frontend/chat-plugin/lib/src/websocket/index.ts b/frontend/chat-plugin/lib/src/websocket/index.ts
index 15a403df3e..1472b0b87f 100644
--- a/frontend/chat-plugin/lib/src/websocket/index.ts
+++ b/frontend/chat-plugin/lib/src/websocket/index.ts
@@ -9,9 +9,7 @@ import {
 } from 'render/providers/chatplugin/chatPluginModel';
 import {Message} from 'model';
 import {getResumeTokenFromStorage, resetStorage} from '../storage';
-
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 // https: -> wss: and http: -> ws:
 const protocol = location.protocol.replace('http', 'ws');
diff --git a/frontend/control-center/public/start.html b/frontend/control-center/public/start.html
index 82eca32158..692b5d80d9 100644
--- a/frontend/control-center/public/start.html
+++ b/frontend/control-center/public/start.html
@@ -162,7 +162,7 @@
       </svg>
     </div>
     <div class="content">
-      <a style="text-decoration: none;" href="/control-center">
+      <a style="text-decoration: none;" href="/control-center/">
         <div class="box">
           <div class="boxTitle">Control Center</div>
           <svg width="47" height="47" viewBox="0 0 47 47" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -174,7 +174,7 @@
           <button class="boxButton">Sign In</button>
         </div>
       </a>
-      <a style="text-decoration: none;" href="/inbox">
+      <a style="text-decoration: none;" href="/inbox/">
         <div class="box">
           <div class="boxTitle">Inbox</div>
           <svg width="51" height="51" viewBox="0 0 51 51" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/frontend/control-center/src/App.tsx b/frontend/control-center/src/App.tsx
index 6ef4ab0d42..f17139b061 100644
--- a/frontend/control-center/src/App.tsx
+++ b/frontend/control-center/src/App.tsx
@@ -6,13 +6,6 @@ import styles from './App.module.scss';
 import {getClientConfig} from './actions/config';
 import {Navigate, Route, Routes} from 'react-router-dom';
 import {INBOX_ROUTE, CATALOG_ROUTE, CONNECTORS_ROUTE, ROOT_ROUTE, STATUS_ROUTE, WEBHOOKS_ROUTE} from './routes/routes';
-import FacebookConnect from './pages/Connectors/Providers/Facebook/Messenger/FacebookConnect';
-import ChatPluginConnect from './pages/Connectors/Providers/Airy/ChatPlugin/ChatPluginConnect';
-import ConnectedChannelsList from './pages/Connectors/ConnectedChannelsList';
-import TwilioSmsConnect from './pages/Connectors/Providers/Twilio/SMS/TwilioSmsConnect';
-import TwilioWhatsappConnect from './pages/Connectors/Providers/Twilio/WhatsApp/TwilioWhatsappConnect';
-import GoogleConnect from './pages/Connectors/Providers/Google/GoogleConnect';
-import InstagramConnect from './pages/Connectors/Providers/Instagram/InstagramConnect';
 import NotFound from './pages/NotFound';
 import ConnectorsOutlet from './pages/Connectors/ConnectorsOutlet';
 import Catalog from './pages/Catalog';
@@ -21,8 +14,6 @@ import Connectors from './pages/Connectors';
 import Webhooks from './pages/Webhooks';
 import Status from './pages/Status';
 import Inbox from './pages/Inbox';
-import ChannelsList from './pages/Inbox/ChannelsList';
-import InboxOutlet from './pages/Inbox/InboxOutlet';
 import ConnectorConfig from './pages/Connectors/ConnectorConfig';
 import CatalogProductPage from './pages/Catalog/CatalogItemDetails';
 
@@ -53,32 +44,16 @@ const App = (props: ConnectedProps<typeof connector>) => {
           <Route path={`${CONNECTORS_ROUTE}/:source/*`} element={<ConnectorsOutlet />}>
             <Route path={`connected`} element={<ConnectorConfig />} />
             <Route path={`new`} element={<ConnectorConfig />} />
+            <Route path={`configure`} element={<ConnectorConfig />} />
             <Route path={`:channelId`} element={<ConnectorConfig />} />
           </Route>
 
           <Route path={`${CATALOG_ROUTE}/*`} element={<CatalogOutlet />}>
-            <Route path={`facebook/:channelId`} element={<FacebookConnect />} />
-            <Route path={`chatplugin/:channelId`} element={<ChatPluginConnect />} />
-            <Route path={`connected/:source`} element={<ConnectedChannelsList />} />
-            <Route path={`twilio.sms/:channelId`} element={<TwilioSmsConnect />} />
-            <Route path={`twilio.whatsapp/:channelId`} element={<TwilioWhatsappConnect />} />
-            <Route path={`google/:channelId`} element={<GoogleConnect />} />
-            <Route path={`instagram/:channelId`} element={<InstagramConnect />} />
-
             <Route path={`:componentName`} element={<CatalogProductPage />} />
             <Route index element={<Catalog />} />
           </Route>
 
-          <Route path={`${INBOX_ROUTE}/*`} element={<InboxOutlet />}>
-            <Route path={`facebook/:channelId`} element={<FacebookConnect />} />
-            <Route path={`chatplugin/:channelId`} element={<ChatPluginConnect />} />
-            <Route path={`connected/:source`} element={<ChannelsList />} />
-            <Route path={`twilio.sms/:channelId`} element={<TwilioSmsConnect />} />
-            <Route path={`twilio.whatsapp/:channelId`} element={<TwilioWhatsappConnect />} />
-            <Route path={`google/:channelId`} element={<GoogleConnect />} />
-            <Route path={`instagram/:channelId`} element={<InstagramConnect />} />
-            <Route index element={<Inbox />} />
-          </Route>
+          <Route path={`${INBOX_ROUTE}/*`} element={<Inbox />} />
 
           <Route element={<NotFound />} />
           <Route path={`${WEBHOOKS_ROUTE}/*`} element={<Webhooks />} />
diff --git a/frontend/control-center/src/actions/channel/index.ts b/frontend/control-center/src/actions/channel/index.ts
index 9f28ba6248..0db1cdcc7f 100644
--- a/frontend/control-center/src/actions/channel/index.ts
+++ b/frontend/control-center/src/actions/channel/index.ts
@@ -13,6 +13,8 @@ import {
   UpdateChannelRequestPayload,
   ConnectChannelGoogleRequestPayload,
   ConnectChannelInstagramRequestPayload,
+  ConnectWhatsappRequestPayload,
+  ConnectViberRequestPayload,
 } from 'httpclient/src';
 
 import {HttpClientInstance} from '../../httpClient';
@@ -52,6 +54,19 @@ export const connectInstagramChannel =
       return Promise.resolve(response);
     });
 
+export const connectWhatsappChannel =
+  (requestPayload: ConnectWhatsappRequestPayload) => async (dispatch: Dispatch<any>) =>
+    HttpClientInstance.connectWhatsappChannel(requestPayload).then((response: Channel) => {
+      dispatch(addChannelsAction([response]));
+      return Promise.resolve(response);
+    });
+
+export const connectViberChannel = (requestPayload: ConnectViberRequestPayload) => async (dispatch: Dispatch<any>) =>
+  HttpClientInstance.connectViberChannel(requestPayload).then((response: Channel) => {
+    dispatch(addChannelsAction([response]));
+    return Promise.resolve(response);
+  });
+
 export const connectChatPlugin = (requestPayload: ConnectChatPluginRequestPayload) => async (dispatch: Dispatch<any>) =>
   HttpClientInstance.connectChatPluginChannel(requestPayload).then((response: Channel) => {
     dispatch(addChannelsAction([response]));
diff --git a/frontend/control-center/src/components/ChannelAvatar/index.tsx b/frontend/control-center/src/components/ChannelAvatar/index.tsx
index 21e7371128..4da1eda0da 100644
--- a/frontend/control-center/src/components/ChannelAvatar/index.tsx
+++ b/frontend/control-center/src/components/ChannelAvatar/index.tsx
@@ -13,6 +13,8 @@ import {ReactComponent as SalesforceAvatar} from 'assets/images/icons/salesforce
 import {ReactComponent as CongnigyAvatar} from 'assets/images/icons/congnigyLogo.svg';
 import {ReactComponent as RasaAvatar} from 'assets/images/icons/rasaLogo.svg';
 import {ReactComponent as AmeliaAvatar} from 'assets/images/icons/ameliaLogo.svg';
+import {ReactComponent as AmazonS3Avatar} from 'assets/images/icons/amazons3Logo.svg';
+import {ReactComponent as IbmWatsonAssistantAvatar} from 'assets/images/icons/ibmWatsonAssistantLogo.svg';
 
 import {Channel, Source} from 'model';
 import styles from './index.module.scss';
@@ -65,12 +67,21 @@ export const getChannelAvatar = (source: string) => {
     case Source.salesforce:
     case 'Salesforce':
       return <SalesforceAvatar />;
+    case Source.congnigy:
     case 'Congnigy':
       return <CongnigyAvatar />;
+    case Source.rasa:
     case 'Rasa':
       return <RasaAvatar />;
+    case Source.amelia:
     case 'Amelia':
       return <AmeliaAvatar />;
+    case Source.amazons3:
+    case 'Amazon S3':
+      return <AmazonS3Avatar />;
+    case Source.ibm:
+    case 'IBM Watson Assistant':
+      return <IbmWatsonAssistantAvatar />;
     default:
       return <AiryAvatar />;
   }
diff --git a/frontend/control-center/src/components/Sidebar/index.tsx b/frontend/control-center/src/components/Sidebar/index.tsx
index bf6c02ff4b..c8949b400b 100644
--- a/frontend/control-center/src/components/Sidebar/index.tsx
+++ b/frontend/control-center/src/components/Sidebar/index.tsx
@@ -1,39 +1,40 @@
 import React from 'react';
 import {Link} from 'react-router-dom';
 import {useMatch} from 'react-router';
-
+import {connect, ConnectedProps} from 'react-redux';
+import {StateModel} from '../../reducers';
+import {useCurrentComponentForSource} from '../../selectors';
+import {Source} from 'model';
 import {CATALOG_ROUTE, CONNECTORS_ROUTE, INBOX_ROUTE, STATUS_ROUTE, WEBHOOKS_ROUTE} from '../../routes/routes';
+
 import {ReactComponent as ConnectorsIcon} from 'assets/images/icons/gitMerge.svg';
 import {ReactComponent as CatalogIcon} from 'assets/images/icons/catalogIcon.svg';
 import {ReactComponent as WebhooksIcon} from 'assets/images/icons/webhooksIcon.svg';
 import {ReactComponent as StatusIcon} from 'assets/images/icons/statusIcon.svg';
 import {ReactComponent as InboxIcon} from 'assets/images/icons/inboxIcon.svg';
-
 import styles from './index.module.scss';
-import {StateModel} from '../../reducers';
-import {connect, ConnectedProps} from 'react-redux';
-import {ComponentName, ComponentRepository} from 'model';
 
 type SideBarProps = {} & ConnectedProps<typeof connector>;
 
 const mapStateToProps = (state: StateModel) => ({
   version: state.data.config.clusterVersion,
   components: state.data.config.components,
-  catalog: state.data.catalog,
 });
 
 const connector = connect(mapStateToProps);
 
 const Sidebar = (props: SideBarProps) => {
+  const {version, components} = props;
+  const componentInfo = useCurrentComponentForSource(Source.webhooks);
+
+  const webhooksEnabled = componentInfo.installed;
+  const inboxEnabled = components[Source.frontendInbox]?.enabled || false;
+  const showLine = inboxEnabled || webhooksEnabled;
+
   const isActive = (route: string) => {
     return useMatch(`${route}/*`);
   };
 
-  const webhooksEnabled =
-    props.catalog[`${ComponentRepository.airyCore}/${ComponentName.integrationWebhook}`]?.installed;
-  const inboxEnabled = props.components[ComponentName.frontendInbox]?.enabled || false;
-  const showLine = inboxEnabled || webhooksEnabled;
-
   return (
     <nav className={styles.wrapper}>
       <div className={styles.linkSection}>
@@ -81,7 +82,7 @@ const Sidebar = (props: SideBarProps) => {
           </div>
         </>
       </div>
-      <span className={styles.version}>Version {props.version}</span>
+      <span className={styles.version}>Version {version}</span>
     </nav>
   );
 };
diff --git a/frontend/control-center/src/components/TopBar/index.tsx b/frontend/control-center/src/components/TopBar/index.tsx
index a73a91653c..851674cc9f 100644
--- a/frontend/control-center/src/components/TopBar/index.tsx
+++ b/frontend/control-center/src/components/TopBar/index.tsx
@@ -17,7 +17,7 @@ import {env} from '../../env';
 import {useAnimation} from 'render';
 import {useTranslation} from 'react-i18next';
 import i18next from 'i18next';
-import {Language, ComponentName} from 'model';
+import {Language, Source} from 'model';
 
 interface TopBarProps {
   isAdmin: boolean;
@@ -44,7 +44,7 @@ const TopBar = (props: TopBarProps & ConnectedProps<typeof connector>) => {
   const [chevronLanguageAnim, setChevronLanguageAnim] = useState(false);
   const [currentLanguage, setCurrentLanguage] = useState(localStorage.getItem('language') || Language.english);
   const {t} = useTranslation();
-  const inboxEnabled = props.components[ComponentName.frontendInbox]?.enabled || false;
+  const inboxEnabled = props.components[Source.frontendInbox]?.enabled || false;
 
   useLayoutEffect(() => {
     handleLanguage(localStorage.getItem('language'));
diff --git a/frontend/control-center/src/pages/Catalog/CatalogCard/index.module.scss b/frontend/control-center/src/pages/Catalog/CatalogCard/index.module.scss
index 3394acc0a2..16347deeb9 100644
--- a/frontend/control-center/src/pages/Catalog/CatalogCard/index.module.scss
+++ b/frontend/control-center/src/pages/Catalog/CatalogCard/index.module.scss
@@ -139,3 +139,44 @@
 .headerModal {
   @include font-xl;
 }
+
+.notifyMeButton {
+  display: flex;
+  white-space: nowrap;
+}
+
+.availableForSoonContainer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.soonTag {
+  @include font-xs;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 8px;
+  height: 22px;
+  width: 50px;
+  border-radius: 5px;
+  background: var(--color-notify-me);
+  color: var(--color-background-white);
+}
+
+.comingSoonTag {
+  @include font-xs;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+  height: 24px;
+  width: 104px;
+  color: white;
+  background: var(--color-notify-me);
+  margin-top: 14px;
+  white-space: nowrap;
+  &:hover {
+    background: var(--color-notify-me);
+  }
+}
diff --git a/frontend/control-center/src/pages/Catalog/CatalogCard/index.tsx b/frontend/control-center/src/pages/Catalog/CatalogCard/index.tsx
index 18b5794eb9..1f1e4bbc39 100644
--- a/frontend/control-center/src/pages/Catalog/CatalogCard/index.tsx
+++ b/frontend/control-center/src/pages/Catalog/CatalogCard/index.tsx
@@ -4,17 +4,16 @@ import {useTranslation} from 'react-i18next';
 import {connect, ConnectedProps} from 'react-redux';
 import {StateModel} from '../../../reducers';
 import {installComponent} from '../../../actions/catalog';
-import {ComponentInfo, NotificationModel} from 'model';
+import {ComponentInfo, ConnectorPrice, NotificationModel} from 'model';
 import {Button, NotificationComponent, SettingsModal, SmartButton} from 'components';
 import {getChannelAvatar} from '../../../components/ChannelAvatar';
-import {
-  getConnectedRouteForComponent,
-  getNewChannelRouteForComponent,
-  getCatalogProductRouteForComponent,
-} from '../../../services';
+import {getCatalogProductRouteForComponent, getConnectedRouteForComponent, removePrefix} from '../../../services';
 import {DescriptionComponent, getDescriptionSourceName} from '../../../components/Description';
 import {ReactComponent as CheckmarkIcon} from 'assets/images/icons/checkmarkFilled.svg';
 import styles from './index.module.scss';
+import NotifyMeModal from '../NotifyMeModal';
+import {CONNECTORS_ROUTE} from '../../../routes/routes';
+import {getMergedConnectors} from '../../../selectors';
 
 type CatalogCardProps = {
   componentInfo: ComponentInfo;
@@ -22,6 +21,7 @@ type CatalogCardProps = {
 
 const mapStateToProps = (state: StateModel) => ({
   component: state.data.catalog,
+  connectors: getMergedConnectors(state),
 });
 
 const mapDispatchToProps = {
@@ -33,20 +33,27 @@ const connector = connect(mapStateToProps, mapDispatchToProps);
 export const availabilityFormatted = (availability: string) => availability.split(',');
 
 const CatalogCard = (props: CatalogCardProps) => {
-  const {component, componentInfo, installComponent} = props;
+  const {component, connectors, componentInfo, installComponent} = props;
+  const hasConnectedChannels = connectors[removePrefix(componentInfo?.name)].connectedChannels > 0;
+  const isConfigured = connectors[removePrefix(componentInfo?.name)].isConfigured;
+  const isChannel = connectors[removePrefix(componentInfo?.name)].isChannel;
   const isInstalled = component[componentInfo?.name]?.installed;
   const [isModalVisible, setIsModalVisible] = useState(false);
+  const [isNotifyMeModalVisible, setIsNotifyMeModalVisible] = useState(false);
   const [isPending, setIsPending] = useState(false);
   const [notification, setNotification] = useState<NotificationModel>(null);
+  const [notifyMeNotification, setNotifyMeNotification] = useState<NotificationModel>(null);
+  const [forceClose, setForceClose] = useState(false);
+  //Commented until backend is ready for this!!!
+  // const notified = localStorage.getItem(`notified.${componentInfo.source}`);
   const installButtonCard = useRef(null);
   const componentCard = useRef(null);
   const {t} = useTranslation();
   const navigate = useNavigate();
+  const navigateConfigure = `${CONNECTORS_ROUTE}/${componentInfo?.source}/configure`;
 
-  const isChannel = componentInfo?.isChannel;
-
-  const CONFIG_CONNECTED_ROUTE = getConnectedRouteForComponent(componentInfo.source, isChannel);
-  const NEW_CHANNEL_ROUTE = getNewChannelRouteForComponent(componentInfo.source);
+  //Commented until backend is ready for this!!!
+  // const notifiedEmail = t('infoNotifyMe') + ` ${notified}`;
 
   const openInstallModal = () => {
     setIsPending(true);
@@ -72,17 +79,54 @@ const CatalogCard = (props: CatalogCardProps) => {
     const isClickOnCard = componentCard?.current.contains(e.target);
 
     if (!isClickOnInstallButton && isClickOnCard) {
-      navigate(getCatalogProductRouteForComponent(componentInfo.displayName), {state: {componentInfo}});
+      navigate(getCatalogProductRouteForComponent(componentInfo.source), {state: {componentInfo}});
     }
   };
 
+  //Commented until backend is ready for this!!!
+  // const handleNotifyMeClick = () => {
+  //   setIsNotifyMeModalVisible(true);
+  //   notified && setNotification({show: true, text: notifiedEmail, info: true});
+  // };
+
   const CatalogCardButton = () => {
+    //Commented until backend is ready for this!!!
+
+    // if (componentInfo?.price === ConnectorPrice.requestAccess) {
+    //   return (
+    //     <Button
+    //       styleVariant={notified ? 'purpleOutline' : 'purple'}
+    //       type="submit"
+    //       onClick={handleNotifyMeClick}
+    //       buttonRef={installButtonCard}
+    //       className={styles.notifyMeButton}>
+    //       {notified ? t('notifyMeRequestSent').toUpperCase() : t('notifyMe').toUpperCase()}
+    //     </Button>
+    //   );
+    // }
+
+    if (componentInfo?.price === ConnectorPrice.requestAccess) {
+      return (
+        <Button
+          className={styles.comingSoonTag}
+          onClick={() => navigate(getCatalogProductRouteForComponent(componentInfo.source), {state: {componentInfo}})}
+          buttonRef={installButtonCard}
+        >
+          {t('comingSoon').toUpperCase()}
+        </Button>
+      );
+    }
+
     if (isInstalled) {
       return (
         <Button
           styleVariant="extra-small"
           type="submit"
-          onClick={() => navigate(CONFIG_CONNECTED_ROUTE)}
+          onClick={() =>
+            navigate(
+              getConnectedRouteForComponent(componentInfo?.source, isChannel, hasConnectedChannels, isConfigured)
+            )
+          }
           buttonRef={installButtonCard}
         >
           {t('open').toUpperCase()}
@@ -116,7 +160,6 @@ const CatalogCard = (props: CatalogCardProps) => {
           </div>
           <div className={styles.componentInfo}>
             <h1>{componentInfo.displayName}</h1>
-
             <p>
               {' '}
               <span className={styles.bolded}>{t('categories')}:</span> {componentInfo.category}{' '}
@@ -135,10 +178,19 @@ const CatalogCard = (props: CatalogCardProps) => {
             <CheckmarkIcon className={styles.availabilityCheckmarkIcon} />
             {t('availableFor')}:
           </p>
-          {componentInfo?.availableFor &&
-            availabilityFormatted(componentInfo.availableFor).map((service: string) => (
-              <button key={service}>{service}</button>
-            ))}
+          <div className={styles.availableForSoonContainer}>
+            <div>
+              {componentInfo?.availableFor &&
+                availabilityFormatted(componentInfo.availableFor).map((service: string) => (
+                  <button key={service}>{service}</button>
+                ))}
+            </div>
+            {/* Commented until backend is ready for this!!!
+
+             {componentInfo?.price === ConnectorPrice.requestAccess && (
+              <div className={styles.soonTag}>{t('soon').toUpperCase()}</div>
+            )} */}
+          </div>
         </div>
 
         {isModalVisible && (
@@ -150,18 +202,44 @@ const CatalogCard = (props: CatalogCardProps) => {
             close={closeModal}
             headerClassName={styles.headerModal}
           >
-            <Button styleVariant="normal" type="submit" onClick={() => navigate(NEW_CHANNEL_ROUTE)}>
+            <Button
+              styleVariant="normal"
+              type="submit"
+              onClick={() => navigate(navigateConfigure, {state: {from: 'catalog'}})}
+            >
               {t('toConfigure')}
             </Button>
           </SettingsModal>
         )}
+
+        {isNotifyMeModalVisible && (
+          <NotifyMeModal
+            source={componentInfo.source}
+            setIsModalVisible={setIsNotifyMeModalVisible}
+            setNotification={setNotifyMeNotification}
+            setForceClose={setForceClose}
+          />
+        )}
       </article>
       {notification?.show && (
         <NotificationComponent
+          type={notification.info ? 'sticky' : 'fade'}
           show={notification.show}
           text={notification.text}
           successful={notification.successful}
           setShowFalse={setNotification}
+          forceClose={forceClose}
+          setForceClose={setForceClose}
+          info={notification.info}
+        />
+      )}
+      {notifyMeNotification?.show && (
+        <NotificationComponent
+          type="sticky"
+          show={notifyMeNotification.show}
+          text={notifyMeNotification.text}
+          successful={notifyMeNotification.successful}
+          setShowFalse={setNotifyMeNotification}
         />
       )}
     </>
diff --git a/frontend/control-center/src/pages/Catalog/CatalogItemDetails/index.module.scss b/frontend/control-center/src/pages/Catalog/CatalogItemDetails/index.module.scss
index e22879de72..32a771eea8 100644
--- a/frontend/control-center/src/pages/Catalog/CatalogItemDetails/index.module.scss
+++ b/frontend/control-center/src/pages/Catalog/CatalogItemDetails/index.module.scss
@@ -187,3 +187,37 @@
 .headerModal {
   @include font-xl;
 }
+
+.availabilitySoonContainer {
+  display: flex;
+  align-items: center;
+}
+
+.soonTag {
+  @include font-xs-bold;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 20px;
+  margin-left: 4px;
+  height: 22px;
+  width: 50px;
+  border-radius: 5px;
+  background: var(--color-notify-me);
+  color: var(--color-background-white);
+}
+
+//As long the backend is not ready!!!
+.comingSoonTag {
+  @include font-base;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+  height: 50px;
+  width: 180px;
+  color: var(--color-background-white);
+  background: var(--color-notify-me);
+  margin-top: 15px;
+  white-space: nowrap;
+}
diff --git a/frontend/control-center/src/pages/Catalog/CatalogItemDetails/index.tsx b/frontend/control-center/src/pages/Catalog/CatalogItemDetails/index.tsx
index 9a8c95f550..22c1be226c 100644
--- a/frontend/control-center/src/pages/Catalog/CatalogItemDetails/index.tsx
+++ b/frontend/control-center/src/pages/Catalog/CatalogItemDetails/index.tsx
@@ -4,7 +4,7 @@ import {useTranslation} from 'react-i18next';
 import {connect, ConnectedProps} from 'react-redux';
 import {installComponent, uninstallComponent} from '../../../actions/catalog';
 import {StateModel} from '../../../reducers';
-import {ComponentInfo, Modal, ModalType, NotificationModel} from 'model';
+import {ComponentInfo, ConnectorPrice, Modal, ModalType, NotificationModel} from 'model';
 import {ContentWrapper, Button, LinkButton, SettingsModal, NotificationComponent, SmartButton} from 'components';
 import {getChannelAvatar} from '../../../components/ChannelAvatar';
 import {availabilityFormatted} from '../CatalogCard';
@@ -14,6 +14,7 @@ import {getNewChannelRouteForComponent} from '../../../services';
 import {ReactComponent as ArrowLeftIcon} from 'assets/images/icons/leftArrowCircle.svg';
 import {ReactComponent as CheckmarkIcon} from 'assets/images/icons/checkmarkFilled.svg';
 import styles from './index.module.scss';
+import NotifyMeModal from '../NotifyMeModal';
 
 const mapStateToProps = (state: StateModel) => ({
   component: state.data.catalog,
@@ -36,15 +37,19 @@ const CatalogItemDetails = (props: ConnectedProps<typeof connector>) => {
   const locationState = location.state as LocationState;
   const {componentInfo} = locationState;
 
-  const isInstalled = component[componentInfo?.name]?.installed;
   const [isModalVisible, setIsModalVisible] = useState(false);
+  const [isNotifyMeModalVisible, setIsNotifyMeModalVisible] = useState(false);
   const [modal, setModal] = useState<Modal>(null);
   const [isPending, setIsPending] = useState(false);
   const [notification, setNotification] = useState<NotificationModel>(null);
-
+  const [notifyMeNotification, setNotifyMeNotification] = useState<NotificationModel>(null);
+  const [forceClose, setForceClose] = useState(false);
+  const notified = localStorage.getItem(`notified.${componentInfo.source}`);
   const {t} = useTranslation();
+  const notifiedEmail = t('infoNotifyMe') + ` ${notified}`;
   const navigate = useNavigate();
   const NEW_COMPONENT_INSTALL_ROUTE = getNewChannelRouteForComponent(componentInfo.source);
+  const isInstalled = component[componentInfo?.name]?.installed;
 
   const uninstallText = t('uninstall') + ` ${componentInfo.displayName}`;
   const installText = `${componentInfo.displayName} ` + t('installed');
@@ -89,6 +94,11 @@ const CatalogItemDetails = (props: ConnectedProps<typeof connector>) => {
       });
   };
 
+  const handleNotifyMeClick = () => {
+    setIsNotifyMeModalVisible(true);
+    notified && setNotification({show: true, text: notifiedEmail, info: true});
+  };
+
   const HeaderContent = () => {
     return (
       <section className={styles.heading}>
@@ -104,7 +114,7 @@ const CatalogItemDetails = (props: ConnectedProps<typeof connector>) => {
     return (
       <section className={styles.componentDescription}>
         <h1>{t('Description')}</h1>
-        <p>{componentInfo.description}</p>
+        <p style={{whiteSpace: 'pre-wrap'}}>{componentInfo.description}</p>
       </section>
     );
   };
@@ -123,20 +133,48 @@ const CatalogItemDetails = (props: ConnectedProps<typeof connector>) => {
 
         <section className={styles.detailsComponentLogo}>
           <div className={styles.logoIcon}>{getChannelAvatar(componentInfo?.displayName)}</div>
-          <SmartButton
-            title={isInstalled ? t('uninstall') : t('install')}
-            height={50}
-            width={180}
-            onClick={openModalInstall}
-            pending={isPending}
-            styleVariant={isInstalled ? 'warning' : 'green'}
-            className={styles.installButton}
-          />
+          {componentInfo?.price === ConnectorPrice.requestAccess ? (
+            <div className={styles.comingSoonTag}>{t('comingSoon').toUpperCase()}</div>
+          ) : (
+            <SmartButton
+              title={
+                componentInfo?.price === ConnectorPrice.requestAccess
+                  ? notified
+                    ? t('notifyMeRequestSent').toUpperCase()
+                    : t('notifyMe').toUpperCase()
+                  : isInstalled
+                  ? t('uninstall')
+                  : t('install')
+              }
+              height={50}
+              width={180}
+              onClick={componentInfo?.price === ConnectorPrice.requestAccess ? handleNotifyMeClick : openModalInstall}
+              pending={isPending}
+              styleVariant={
+                componentInfo?.price === ConnectorPrice.requestAccess
+                  ? notified
+                    ? 'purpleOutline'
+                    : 'purple'
+                  : isInstalled
+                  ? 'warning'
+                  : 'green'
+              }
+              className={styles.installButton}
+            />
+          )}
         </section>
 
         <section className={styles.details}>
           <section className={styles.detailInfo}>
-            <p className={`${styles.availability} ${styles.bolded}`}>{t('availableFor')}:</p>
+            <div className={styles.availabilitySoonContainer}>
+              <p className={`${styles.availability} ${styles.bolded}`}>{t('availableFor')}:</p>
+              {/* 
+              Commented until backend is ready!!!
+
+              {componentInfo?.price === ConnectorPrice.requestAccess && (
+                <div className={styles.soonTag}>{t('soon').toUpperCase()}</div>
+              )} */}
+            </div>
             {componentInfo?.availableFor &&
               availabilityFormatted(componentInfo.availableFor).map((service: string) => (
                 <button key={service}>{service}</button>
@@ -154,7 +192,7 @@ const CatalogItemDetails = (props: ConnectedProps<typeof connector>) => {
           <section className={styles.detailInfo}>
             <p className={styles.bolded}>{t('price')}:</p>
             <button key={componentInfo?.price}>
-              {componentInfo?.price === 'REQUEST ACCESS' ? (
+              {componentInfo?.price === ConnectorPrice.requestAccess ? (
                 <a href="mailto:componentsaccess@airy.co" target="_blank" rel="noreferrer">
                   {t(componentInfo?.price)}
                 </a>
@@ -189,12 +227,24 @@ const CatalogItemDetails = (props: ConnectedProps<typeof connector>) => {
                 {t('uninstall')}
               </Button>
             ) : (
-              <Button styleVariant="normal" type="submit" onClick={() => navigate(NEW_COMPONENT_INSTALL_ROUTE)}>
+              <Button
+                styleVariant="normal"
+                type="submit"
+                onClick={() => navigate(NEW_COMPONENT_INSTALL_ROUTE, {state: {from: 'catalog'}})}
+              >
                 {t('toConfigure')}
               </Button>
             )}
           </SettingsModal>
         )}
+        {isNotifyMeModalVisible && (
+          <NotifyMeModal
+            setIsModalVisible={setIsNotifyMeModalVisible}
+            setNotification={setNotifyMeNotification}
+            setForceClose={setForceClose}
+            source={componentInfo.source}
+          />
+        )}
       </>
     );
   };
@@ -211,10 +261,23 @@ const CatalogItemDetails = (props: ConnectedProps<typeof connector>) => {
       />
       {notification?.show && (
         <NotificationComponent
+          type={notification.info ? 'sticky' : 'fade'}
           show={notification.show}
           text={notification.text}
           successful={notification.successful}
           setShowFalse={setNotification}
+          forceClose={forceClose}
+          setForceClose={setForceClose}
+          info={notification.info}
+        />
+      )}
+      {notifyMeNotification?.show && (
+        <NotificationComponent
+          type="sticky"
+          show={notifyMeNotification.show}
+          text={notifyMeNotification.text}
+          successful={notifyMeNotification.successful}
+          setShowFalse={setNotifyMeNotification}
         />
       )}
     </>
diff --git a/frontend/control-center/src/pages/Catalog/CatalogSearchBar/CatalogSearchBar.module.scss b/frontend/control-center/src/pages/Catalog/CatalogSearchBar/CatalogSearchBar.module.scss
new file mode 100644
index 0000000000..19037c7251
--- /dev/null
+++ b/frontend/control-center/src/pages/Catalog/CatalogSearchBar/CatalogSearchBar.module.scss
@@ -0,0 +1,76 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.container {
+  display: flex;
+  align-items: center;
+}
+
+.iconContainer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  svg {
+    margin-left: 16px;
+    color: var(--color-text-gray);
+
+    &:hover {
+      cursor: pointer;
+      color: var(--color-airy-blue);
+    }
+  }
+  .filterIcon {
+    transition: background 0.5s ease;
+    color: var(--color-background-white);
+    margin-left: 16px;
+    background: var(--color-airy-logo-blue);
+    border-radius: 24px;
+  }
+}
+
+.searchField {
+  width: 200px;
+  background: var(--color-background-white);
+  border: 1px solid var(--color-airy-blue);
+  border-radius: 4px;
+
+  svg {
+    color: black;
+  }
+}
+
+@keyframes animateFilterModalIn {
+  0% {
+    transform: translateX(200px);
+    opacity: 0;
+  }
+
+  100% {
+    transform: translateX(0px);
+    opacity: 1;
+  }
+}
+
+@keyframes animateFilterModalOut {
+  0% {
+    transform: translateX(0px);
+    opacity: 1;
+  }
+  100% {
+    transform: translateX(200px);
+    opacity: 0;
+  }
+}
+
+.filterModal {
+  position: absolute;
+  top: 170px;
+  right: 54px;
+}
+
+.filterModalAnimIn {
+  animation: animateFilterModalIn 500ms ease;
+}
+.filterModalAnimOut {
+  animation: animateFilterModalOut 500ms ease;
+}
diff --git a/frontend/control-center/src/pages/Catalog/CatalogSearchBar/CatalogSearchBar.tsx b/frontend/control-center/src/pages/Catalog/CatalogSearchBar/CatalogSearchBar.tsx
new file mode 100644
index 0000000000..0ba4ebb0ad
--- /dev/null
+++ b/frontend/control-center/src/pages/Catalog/CatalogSearchBar/CatalogSearchBar.tsx
@@ -0,0 +1,74 @@
+import React, {Dispatch, SetStateAction, useCallback, useEffect, useState} from 'react';
+import {ReactComponent as SearchIcon} from 'assets/images/icons/search.svg';
+import {ReactComponent as FilterIcon} from 'assets/images/icons/filterAlt.svg';
+import styles from './CatalogSearchBar.module.scss';
+import {ListenOutsideClick, SearchField} from 'components';
+import {useTranslation} from 'react-i18next';
+import {FilterCatalogModal, FilterTypes} from './FilterCatalogModal/FilterCatalogModal';
+import {useAnimation} from 'render';
+
+type CatalogSearchBarProps = {
+  currentFilter: FilterTypes;
+  setCurrentFilter: Dispatch<SetStateAction<FilterTypes>>;
+  setQuery: Dispatch<SetStateAction<string>>;
+};
+
+export const CatalogSearchBar = (props: CatalogSearchBarProps) => {
+  const {t} = useTranslation();
+  const [query, setQuery] = useState('');
+  const [currentFilter, setCurrentFilter] = useState(props.currentFilter);
+  const [showSearchField, setShowingSearchField] = useState(false);
+  const [showFilter, setShowFilter] = useState(false);
+  const [animationAction, setAnimationAction] = useState(false);
+
+  const toggleShowFilter = useCallback(() => {
+    useAnimation(showFilter, setShowFilter, setAnimationAction, 500);
+  }, [showFilter, setShowFilter]);
+
+  useEffect(() => {
+    props.setCurrentFilter(currentFilter);
+  }, [currentFilter]);
+
+  const handleSearchClick = () => {
+    setShowingSearchField(true);
+  };
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.iconContainer}>
+        {showSearchField ? (
+          <SearchField
+            autoFocus
+            className={styles.searchField}
+            placeholder={t('searchByNamePlaceholder')}
+            value={query}
+            setValue={(value: string) => {
+              setQuery(value), props.setQuery(value);
+            }}
+          />
+        ) : (
+          <SearchIcon height={20} width={20} className={styles.searchIcon} onClick={handleSearchClick} />
+        )}
+        <FilterIcon
+          height={24}
+          width={24}
+          className={currentFilter !== FilterTypes.all ? styles.filterIcon : ''}
+          onClick={toggleShowFilter}
+        />
+        <div
+          className={`${styles.filterModal} ${animationAction ? styles.filterModalAnimIn : styles.filterModalAnimOut}`}
+        >
+          {showFilter && (
+            <ListenOutsideClick onOuterClick={showFilter && toggleShowFilter}>
+              <FilterCatalogModal
+                currentFilter={currentFilter}
+                setCurrentFilter={setCurrentFilter}
+                setShowFilter={toggleShowFilter}
+              />
+            </ListenOutsideClick>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/frontend/control-center/src/pages/Catalog/CatalogSearchBar/FilterCatalogModal/FilterCatalogModal.module.scss b/frontend/control-center/src/pages/Catalog/CatalogSearchBar/FilterCatalogModal/FilterCatalogModal.module.scss
new file mode 100644
index 0000000000..f47d62ba29
--- /dev/null
+++ b/frontend/control-center/src/pages/Catalog/CatalogSearchBar/FilterCatalogModal/FilterCatalogModal.module.scss
@@ -0,0 +1,95 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  min-width: 520px;
+  min-height: 300px;
+  background: var(--color-background-white);
+  border: 1px solid var(--color-disabled-gray);
+  border-radius: 10px;
+}
+
+.titleContainer {
+  display: flex;
+  justify-content: space-between;
+  width: 90%;
+  margin: 21px 0px;
+  color: var(--color-text-contrast);
+  text-transform: capitalize;
+
+  h1 {
+    @include font-base;
+    font-weight: bold;
+  }
+}
+
+.closeIcon {
+  svg {
+    color: var(--color-text-contrast);
+    margin-left: 8px;
+  }
+  &:hover {
+    cursor: pointer;
+    color: var(--color-airy-blue);
+    svg {
+      color: var(--color-airy-blue);
+    }
+  }
+}
+
+.filterTypes {
+  display: flex;
+  button {
+    @include font-base;
+    border: 1px solid #1578d4;
+    border-radius: 100px;
+    background: transparent;
+    color: var(--color-airy-blue);
+    margin: 0 12px;
+    &:hover {
+      background: var(--color-background-blue);
+      transition: background 0.5s ease;
+    }
+  }
+  .activeButton {
+    background: var(--color-airy-blue);
+    color: var(--color-background-white);
+    &:hover {
+      background: var(--color-airy-blue);
+      color: var(--color-background-white);
+    }
+  }
+}
+
+.filterTypesDarkMode {
+  @extend .filterTypes;
+  button {
+    border: 1px solid white;
+    color: white;
+  }
+
+  .activeButton {
+    background: var(--color-airy-blue);
+    border: 1px solid var(--color-airy-blue);
+    color: white;
+    &:hover {
+      color: white;
+    }
+  }
+}
+
+.line {
+  height: 1px;
+  width: 100%;
+  background-color: var(--color-text-gray);
+  margin-top: 109px;
+}
+
+.actionButtons {
+  display: flex;
+  align-items: center;
+  margin: 16px 0;
+}
diff --git a/frontend/control-center/src/pages/Catalog/CatalogSearchBar/FilterCatalogModal/FilterCatalogModal.tsx b/frontend/control-center/src/pages/Catalog/CatalogSearchBar/FilterCatalogModal/FilterCatalogModal.tsx
new file mode 100644
index 0000000000..d5367340ea
--- /dev/null
+++ b/frontend/control-center/src/pages/Catalog/CatalogSearchBar/FilterCatalogModal/FilterCatalogModal.tsx
@@ -0,0 +1,78 @@
+import {Button} from 'components';
+import React, {Dispatch, SetStateAction, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {ReactComponent as CloseIcon} from 'assets/images/icons/close.svg';
+import styles from './FilterCatalogModal.module.scss';
+
+export enum FilterTypes {
+  all = 'all',
+  installed = 'installed',
+  comingSoon = 'comingSoon',
+  notInstalled = 'notInstalled',
+}
+
+type FilterCatalogModalProps = {
+  currentFilter: FilterTypes;
+  setCurrentFilter: Dispatch<SetStateAction<FilterTypes>>;
+  setShowFilter: Dispatch<SetStateAction<boolean>>;
+};
+
+export const FilterCatalogModal = (props: FilterCatalogModalProps) => {
+  const [currentFilter, setCurrentFilter] = useState(props.currentFilter || FilterTypes.all);
+  const {t} = useTranslation();
+  const darkModeOn = localStorage.getItem('theme') === 'dark';
+
+  const applyFilter = () => {
+    props.setCurrentFilter(currentFilter);
+    props.setShowFilter(false);
+    localStorage.setItem('catalogCurrentTypeFilter', currentFilter);
+  };
+
+  const clearFilter = () => {
+    setCurrentFilter(FilterTypes.all);
+    props.setCurrentFilter(FilterTypes.all);
+    localStorage.setItem('catalogCurrentTypeFilter', currentFilter);
+  };
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.titleContainer}>
+        <h1>{t('searchByType')}</h1>
+        <CloseIcon className={styles.closeIcon} height={12} width={12} onClick={() => props.setShowFilter(false)} />
+      </div>
+      <div className={darkModeOn ? styles.filterTypesDarkMode : styles.filterTypes}>
+        <Button
+          className={currentFilter === FilterTypes.all ? styles.activeButton : ''}
+          onClick={() => setCurrentFilter(FilterTypes.all)}
+        >
+          {t('all')}
+        </Button>
+        <Button
+          className={currentFilter === FilterTypes.installed && styles.activeButton}
+          onClick={() => setCurrentFilter(FilterTypes.installed)}
+        >
+          {t('installed')}
+        </Button>
+        <Button
+          className={currentFilter === FilterTypes.comingSoon && styles.activeButton}
+          onClick={() => setCurrentFilter(FilterTypes.comingSoon)}
+        >
+          {t('comingSoon')}
+        </Button>
+        <Button
+          className={currentFilter === FilterTypes.notInstalled && styles.activeButton}
+          onClick={() => setCurrentFilter(FilterTypes.notInstalled)}
+        >
+          {t('notInstalled')}
+        </Button>
+      </div>
+      <div className={styles.line} />
+      <div className={styles.actionButtons}>
+        <Button onClick={clearFilter} styleVariant="text" className={styles.clearAllButton}>
+          {t('clearAll')}
+        </Button>
+        <Button onClick={applyFilter}>{t('apply')}</Button>
+      </div>
+    </div>
+  );
+};
diff --git a/frontend/control-center/src/pages/Catalog/NotifyMeModal/index.module.scss b/frontend/control-center/src/pages/Catalog/NotifyMeModal/index.module.scss
new file mode 100644
index 0000000000..7cade1aecb
--- /dev/null
+++ b/frontend/control-center/src/pages/Catalog/NotifyMeModal/index.module.scss
@@ -0,0 +1,87 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.enableModalContainerWrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.enableModalContainer {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  @include font-l;
+
+  label {
+    width: 100%;
+    min-width: 393px;
+    height: 80px;
+  }
+
+  p {
+    max-width: 70%;
+    text-align: center;
+    margin: 4px 0 20px 0;
+    color: var(--color-text-contrast);
+  }
+}
+
+.headerModal {
+  @include font-xl;
+  margin: 54px 0 35px 0;
+}
+
+.messageTextArea {
+  display: flex;
+  width: 100%;
+  background: transparent;
+  position: relative;
+  flex-grow: 1;
+  font-size: 16px;
+  resize: none;
+  outline: none;
+  color: var(--color-text-contrast);
+  padding: 8px;
+  line-height: 24px;
+  max-height: 100px;
+  border: 1px solid var(--color-dark-elements-gray);
+  border-radius: 4px;
+  @include font-base;
+  margin-bottom: 40px;
+}
+
+.sendButton {
+  height: 40px;
+  width: 176px;
+  margin-bottom: 42px;
+  margin-top: 54px;
+}
+
+.messageContainer {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  width: 100%;
+  min-width: 393px;
+  height: 20px;
+  margin-bottom: 5px;
+  span {
+    @include font-s-bold;
+  }
+}
+
+.toolTip {
+  @include font-xs;
+  background: var(--color-text-gray);
+  color: var(--color-background-white);
+  border-radius: 20px;
+  height: 20px;
+  margin-right: -2px;
+  line-height: 12px;
+  padding: 4px 12px;
+  border-color: transparent var(--color-text-gray) transparent transparent;
+}
diff --git a/frontend/control-center/src/pages/Catalog/NotifyMeModal/index.tsx b/frontend/control-center/src/pages/Catalog/NotifyMeModal/index.tsx
new file mode 100644
index 0000000000..3ad4f987ae
--- /dev/null
+++ b/frontend/control-center/src/pages/Catalog/NotifyMeModal/index.tsx
@@ -0,0 +1,100 @@
+import React, {Dispatch, SetStateAction, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {Button, Input, SettingsModal} from 'components';
+import styles from './index.module.scss';
+import {NotificationModel, Source} from 'model';
+import {StateModel} from '../../../reducers';
+import {connect, ConnectedProps} from 'react-redux';
+
+const mapStateToProps = (state: StateModel) => ({
+  user: state.data.user,
+});
+
+const connector = connect(mapStateToProps, null);
+
+type NotifyMeModalProps = {
+  source: Source;
+  setIsModalVisible: Dispatch<SetStateAction<boolean>>;
+  setNotification: Dispatch<SetStateAction<NotificationModel>>;
+  setForceClose?: Dispatch<SetStateAction<boolean>>;
+} & ConnectedProps<typeof connector>;
+
+const NotifyMeModal = (props: NotifyMeModalProps) => {
+  const {source, user, setIsModalVisible, setNotification, setForceClose} = props;
+  const validEmail = user?.id?.slice(6).includes('@');
+  const [email, setEmail] = useState(validEmail ? user?.id?.slice(6) : '');
+  const [name, setName] = useState(user?.name || '');
+
+  const closeModal = () => {
+    setIsModalVisible(false);
+    setForceClose(true);
+  };
+
+  const handleSend = () => {
+    setNotification({show: true, successful: true, text: t('notifyMeSuccessful')});
+    setIsModalVisible(false);
+    setForceClose(true);
+    localStorage.setItem(`notified.${source}`, `${email}`);
+  };
+
+  const validInput = email.includes('@' && '.') && email.length > 5 && name;
+
+  const enterPress = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    if (event.key === 'Enter') {
+      handleSend();
+    }
+  };
+
+  const {t} = useTranslation();
+  return (
+    <SettingsModal
+      wrapperClassName={styles.enableModalContainerWrapper}
+      containerClassName={styles.enableModalContainer}
+      title={t('notifyMeTitle')}
+      close={closeModal}
+      headerClassName={styles.headerModal}
+    >
+      <Input
+        autoFocus={true}
+        type="email"
+        id="email"
+        label={t('emailCapital')}
+        placeholder={t('addEmail')}
+        showLabelIcon
+        tooltipText={t('notifyMeEmailTooltip')}
+        tooltipStyle={styles.toolTip}
+        value={email}
+        onChange={(event: React.ChangeEvent<HTMLInputElement>) => setEmail(event.target.value)}
+        required
+        height={32}
+        onKeyDown={enterPress}
+        fontClass="font-base"
+      />
+      <Input
+        id="name"
+        label={t('name')}
+        placeholder={t('addName')}
+        showLabelIcon
+        tooltipText={t('notifyMeNameTooltip')}
+        tooltipStyle={styles.toolTip}
+        value={name}
+        onChange={(event: React.ChangeEvent<HTMLInputElement>) => setName(event.target.value)}
+        required
+        height={32}
+        onKeyDown={enterPress}
+        fontClass="font-base"
+      />
+      <Button
+        styleVariant="normal"
+        type="submit"
+        onClick={handleSend}
+        className={styles.sendButton}
+        disabled={!validInput}
+      >
+        {t('send')}
+      </Button>
+    </SettingsModal>
+  );
+};
+
+export default connector(NotifyMeModal);
diff --git a/frontend/control-center/src/pages/Catalog/index.module.scss b/frontend/control-center/src/pages/Catalog/index.module.scss
index 2ee93ce47b..278b13a7b0 100644
--- a/frontend/control-center/src/pages/Catalog/index.module.scss
+++ b/frontend/control-center/src/pages/Catalog/index.module.scss
@@ -13,6 +13,12 @@
   width: 100%;
 }
 
+.headlineSearchBarContainer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
 .catalogListContainer {
   display: flex;
   flex-wrap: wrap;
@@ -25,6 +31,18 @@
   color: var(--color-text-contrast);
 }
 
+.notFoundContainer {
+  display: flex;
+  flex-direction: column;
+  h1 {
+    @include font-l;
+    font-weight: bold;
+  }
+  span {
+    @include font-m;
+  }
+}
+
 .notificationAnimation {
   display: flex;
   align-items: center;
diff --git a/frontend/control-center/src/pages/Catalog/index.tsx b/frontend/control-center/src/pages/Catalog/index.tsx
index 0daa42dece..ca3016fc7e 100644
--- a/frontend/control-center/src/pages/Catalog/index.tsx
+++ b/frontend/control-center/src/pages/Catalog/index.tsx
@@ -1,53 +1,125 @@
-import React, {useState, useEffect} from 'react';
+import React, {useState, useEffect, useLayoutEffect} from 'react';
 import {useTranslation} from 'react-i18next';
-import {connect, ConnectedProps, useSelector} from 'react-redux';
-import {listComponents} from '../../actions/catalog';
+import {connect, ConnectedProps} from 'react-redux';
 import {StateModel} from '../../reducers';
 import {setPageTitle} from '../../services';
-import {ComponentInfo} from 'model';
+import {ComponentInfo, ConnectorPrice} from 'model';
 import CatalogCard from './CatalogCard';
 import styles from './index.module.scss';
+import {listComponents, getConnectorsConfiguration, listChannels} from '../../actions';
+import {CatalogSearchBar} from './CatalogSearchBar/CatalogSearchBar';
+import {FilterTypes} from './CatalogSearchBar/FilterCatalogModal/FilterCatalogModal';
+
+const mapStateToProps = (state: StateModel) => {
+  return {
+    catalogList: Object.values(state.data.catalog),
+  };
+};
 
 const mapDispatchToProps = {
   listComponents,
+  getConnectorsConfiguration,
+  listChannels,
 };
 
-const connector = connect(null, mapDispatchToProps);
+const connector = connect(mapStateToProps, mapDispatchToProps);
 
 const Catalog = (props: ConnectedProps<typeof connector>) => {
-  const {listComponents} = props;
-  const [orderedCatalogList, setOrderedCatalogList] = useState([]);
-  const catalogList = useSelector((state: StateModel) => state.data.catalog);
+  const {catalogList, listComponents, getConnectorsConfiguration, listChannels} = props;
+  const [orderedCatalogList, setOrderedCatalogList] = useState<ComponentInfo[]>(catalogList);
   const {t} = useTranslation();
   const catalogPageTitle = t('Catalog');
+  const [currentFilter, setCurrentFilter] = useState(
+    (localStorage.getItem('catalogCurrentTypeFilter') as FilterTypes) || FilterTypes.all
+  );
+  const [query, setQuery] = useState('');
+  const sortByName = (a: ComponentInfo, b: ComponentInfo) => a?.displayName?.localeCompare(b?.displayName);
 
   useEffect(() => {
+    listChannels().catch((error: Error) => {
+      console.error(error);
+    });
+    getConnectorsConfiguration().catch((error: Error) => {
+      console.error(error);
+    });
     listComponents().catch((error: Error) => {
       console.error(error);
     });
     setPageTitle(catalogPageTitle);
   }, []);
 
-  useEffect(() => {
-    setOrderedCatalogList(Object.values(catalogList).sort(sortByInstall));
-  }, [catalogList]);
+  useLayoutEffect(() => {
+    if (query && currentFilter === FilterTypes.all) {
+      const filteredCatalogByName = [...catalogList].filter((component: ComponentInfo) =>
+        component?.displayName?.toLowerCase().includes(query)
+      );
+      setOrderedCatalogList(filteredCatalogByName);
+    } else {
+      const sortedByInstalled = [...catalogList]
+        .filter((component: ComponentInfo) => component.installed && component.price !== ConnectorPrice.requestAccess)
+        .sort(sortByName);
+      const sortedByUninstalled = [...catalogList]
+        .filter((component: ComponentInfo) => !component.installed && component.price !== ConnectorPrice.requestAccess)
+        .sort(sortByName);
+      const sortedByAccess = [...catalogList]
+        .filter((component: ComponentInfo) => component.price === ConnectorPrice.requestAccess)
+        .sort(sortByName);
 
-  const sortByInstall = (a: ComponentInfo) => {
-    if (a.installed) return 1;
-    return -1;
-  };
+      switch (currentFilter) {
+        case FilterTypes.all:
+          setOrderedCatalogList(sortedByInstalled.concat(sortedByUninstalled).concat(sortedByAccess));
+          break;
+        case FilterTypes.installed:
+          query !== ''
+            ? setOrderedCatalogList(
+                sortedByInstalled.filter((component: ComponentInfo) =>
+                  component?.displayName?.toLowerCase().includes(query)
+                )
+              )
+            : setOrderedCatalogList(sortedByInstalled);
+          break;
+        case FilterTypes.comingSoon:
+          query !== ''
+            ? setOrderedCatalogList(
+                sortedByAccess.filter((component: ComponentInfo) =>
+                  component?.displayName?.toLowerCase().includes(query)
+                )
+              )
+            : setOrderedCatalogList(sortedByAccess);
+          break;
+        case FilterTypes.notInstalled:
+          query !== ''
+            ? setOrderedCatalogList(
+                sortedByUninstalled.filter((component: ComponentInfo) =>
+                  component?.displayName?.toLowerCase().includes(query)
+                )
+              )
+            : setOrderedCatalogList(sortedByUninstalled);
+          break;
+      }
+    }
+  }, [catalogList, currentFilter, query]);
 
   return (
     <section className={styles.catalogWrapper}>
-      <h1 className={styles.catalogHeadlineText}>{catalogPageTitle}</h1>
+      <div className={styles.headlineSearchBarContainer}>
+        <h1 className={styles.catalogHeadlineText}>{catalogPageTitle}</h1>
+        <CatalogSearchBar setCurrentFilter={setCurrentFilter} currentFilter={currentFilter} setQuery={setQuery} />
+      </div>
 
       <section className={styles.catalogListContainer}>
-        {orderedCatalogList &&
+        {orderedCatalogList && orderedCatalogList.length > 0 ? (
           orderedCatalogList.map((infoItem: ComponentInfo) => {
             if (infoItem?.name && infoItem?.displayName) {
               return <CatalogCard componentInfo={infoItem} key={infoItem.displayName} />;
             }
-          })}
+          })
+        ) : (
+          <div className={styles.notFoundContainer}>
+            <h1>{t('nothingFound')}</h1>
+            <span>{t('noMatchingCatalogs')}</span>
+          </div>
+        )}
       </section>
     </section>
   );
diff --git a/frontend/control-center/src/pages/Connectors/ChannelCard/index.tsx b/frontend/control-center/src/pages/Connectors/ChannelCard/index.tsx
index 47aa626df3..c42ab0239c 100644
--- a/frontend/control-center/src/pages/Connectors/ChannelCard/index.tsx
+++ b/frontend/control-center/src/pages/Connectors/ChannelCard/index.tsx
@@ -3,14 +3,15 @@ import styles from './index.module.scss';
 import {getChannelAvatar} from '../../../components/ChannelAvatar';
 import {useNavigate} from 'react-router-dom';
 import {ReactComponent as ArrowRightIcon} from 'assets/images/icons/arrowRight.svg';
-import {CONNECTORS_ROUTE} from '../../../routes/routes';
 import {useTranslation} from 'react-i18next';
 import {ConfigStatusButton} from '../ConfigStatusButton';
-import {ComponentStatus, ConnectorCardComponentInfo} from '..';
+import {ComponentStatus} from 'model';
 import {cyAddChannelButton} from 'handles';
+import {getConnectedRouteForComponent, getNewChannelRouteForComponent} from '../../../services';
+import {Connector} from 'model';
 
 type ChannelCardProps = {
-  componentInfo: ConnectorCardComponentInfo;
+  componentInfo: Connector;
   channelsToShow?: number;
   componentStatus?: ComponentStatus;
 };
@@ -19,11 +20,25 @@ export const ChannelCard = (props: ChannelCardProps) => {
   const {componentInfo, channelsToShow, componentStatus} = props;
   const {t} = useTranslation();
   const navigate = useNavigate();
+  const CONFIGURATION_ROUTE = getConnectedRouteForComponent(
+    componentInfo.source,
+    componentInfo.isChannel,
+    componentStatus !== ComponentStatus.notConfigured
+  );
+
+  const CONFIGURATION_ROUTE_NEW = getNewChannelRouteForComponent(
+    componentInfo.source,
+    componentInfo?.isChannel,
+    componentStatus !== ComponentStatus.notConfigured
+  );
 
   return (
     <div
       onClick={event => {
-        event.stopPropagation(), navigate(CONNECTORS_ROUTE + '/' + componentInfo.source + '/connected');
+        event.stopPropagation(),
+          channelsToShow > 0
+            ? navigate(CONFIGURATION_ROUTE, {state: {from: 'connected'}})
+            : navigate(CONFIGURATION_ROUTE_NEW, {state: {from: 'new'}});
       }}
       className={styles.container}
       data-cy={cyAddChannelButton}
@@ -34,7 +49,9 @@ export const ChannelCard = (props: ChannelCardProps) => {
           {componentInfo.displayName}
         </div>
         <div className={styles.linkContainer}>
-          {componentStatus && <ConfigStatusButton componentStatus={componentStatus} />}
+          {componentStatus && (
+            <ConfigStatusButton componentStatus={componentStatus} configurationRoute={CONFIGURATION_ROUTE} />
+          )}
           <span>
             {channelsToShow} {channelsToShow === 1 ? t('channel') : t('channels')}
           </span>
diff --git a/frontend/control-center/src/pages/Connectors/ConfigStatusButton/index.module.scss b/frontend/control-center/src/pages/Connectors/ConfigStatusButton/index.module.scss
index 36c00b3b1c..fcb85fc77d 100644
--- a/frontend/control-center/src/pages/Connectors/ConfigStatusButton/index.module.scss
+++ b/frontend/control-center/src/pages/Connectors/ConfigStatusButton/index.module.scss
@@ -26,13 +26,6 @@
   }
 }
 
-.buttonDisabled,
-.buttonDisabled:hover,
-.buttonDisabled:active,
-.buttonDisabled:visited {
-  background: var(--color-disable-status-config);
-}
-
 .buttonNotHealthy,
 .buttonNotHealthy:hover,
 .buttonNotHealthy:active,
@@ -43,3 +36,10 @@
     background: var(--color-red-alert-pressed);
   }
 }
+
+.buttonDisabled,
+.buttonDisabled:hover,
+.buttonDisabled:active,
+.buttonDisabled:visited {
+  background: var(--color-disable-status-config);
+}
diff --git a/frontend/control-center/src/pages/Connectors/ConfigStatusButton/index.tsx b/frontend/control-center/src/pages/Connectors/ConfigStatusButton/index.tsx
index 7bd9b17389..bbc5c50188 100644
--- a/frontend/control-center/src/pages/Connectors/ConfigStatusButton/index.tsx
+++ b/frontend/control-center/src/pages/Connectors/ConfigStatusButton/index.tsx
@@ -2,13 +2,14 @@ import React from 'react';
 import {Button} from 'components';
 import {useTranslation} from 'react-i18next';
 import styles from './index.module.scss';
-import {ComponentStatus} from '..';
+import {ComponentStatus} from 'model';
 import {useNavigate} from 'react-router-dom';
 import {STATUS_ROUTE} from '../../../routes/routes';
 
 interface ConfigStatusButtonProps {
   componentStatus: ComponentStatus;
   customStyle?: string;
+  configurationRoute?: string;
 }
 
 export const ConfigStatusButton = (props: ConfigStatusButtonProps) => {
@@ -22,10 +23,6 @@ export const ConfigStatusButton = (props: ConfigStatusButtonProps) => {
         event.stopPropagation();
         navigate(STATUS_ROUTE);
         break;
-      case ComponentStatus.notConfigured:
-        event.stopPropagation();
-        console.log('navigate to configurationComponent');
-        break;
       default:
         break;
     }
@@ -38,10 +35,10 @@ export const ConfigStatusButton = (props: ConfigStatusButtonProps) => {
       }}
       styleVariant="extra-small"
       className={`${styles.installationButton} ${customStyle ?? ''} ${
-        componentStatus === ComponentStatus.notHealthy
-          ? styles.buttonNotHealthy
-          : componentStatus === ComponentStatus.notConfigured
+        componentStatus === ComponentStatus.notConfigured
           ? styles.buttonNotConfigured
+          : componentStatus === ComponentStatus.notHealthy
+          ? styles.buttonNotHealthy
           : componentStatus === ComponentStatus.enabled
           ? styles.buttonEnabled
           : styles.buttonDisabled
diff --git a/frontend/control-center/src/pages/Connectors/ConfigureConnector/SetConfigInputs/SetConfigInputs.module.scss b/frontend/control-center/src/pages/Connectors/ConfigureConnector/SetConfigInputs/SetConfigInputs.module.scss
new file mode 100644
index 0000000000..8dd7cf3997
--- /dev/null
+++ b/frontend/control-center/src/pages/Connectors/ConfigureConnector/SetConfigInputs/SetConfigInputs.module.scss
@@ -0,0 +1,7 @@
+.addColumn {
+  display: flex;
+}
+
+.input {
+  height: 80px;
+}
diff --git a/frontend/control-center/src/pages/Connectors/ConfigureConnector/SetConfigInputs/SetConfigInputs.tsx b/frontend/control-center/src/pages/Connectors/ConfigureConnector/SetConfigInputs/SetConfigInputs.tsx
new file mode 100644
index 0000000000..0ac55c7bee
--- /dev/null
+++ b/frontend/control-center/src/pages/Connectors/ConfigureConnector/SetConfigInputs/SetConfigInputs.tsx
@@ -0,0 +1,61 @@
+import {Input} from 'components';
+import {Source} from 'model';
+import React, {Dispatch, SetStateAction, useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import styles from './SetConfigInputs.module.scss';
+
+type SetConfigInputsProps = {
+  configurationValues: {[key: string]: string};
+  setConfig: Dispatch<SetStateAction<{}>>;
+  storedConfig: {};
+  source: string;
+};
+
+export const SetConfigInputs = (props: SetConfigInputsProps) => {
+  const {configurationValues, storedConfig, source} = props;
+  const [input, setInput] = useState(storedConfig || configurationValues);
+  const {t} = useTranslation();
+  const inputArr: React.ReactElement[] = [];
+
+  useEffect(() => {
+    props.setConfig(input);
+  }, [input]);
+
+  source !== Source.chatPlugin &&
+    Object.entries(configurationValues).forEach((item, index) => {
+      const key = item[0];
+      const keyTyped = key as keyof typeof input;
+      const valueTyped = input[keyTyped] || '';
+      const toolTip = key.charAt(0).toUpperCase() + key.slice(1);
+      const replacedKey = key.replace(/([A-Z])/g, ' $1');
+      const label = replacedKey.charAt(0).toUpperCase() + replacedKey.slice(1);
+      const placeholder = `${replacedKey.charAt(0).toUpperCase() + replacedKey.slice(1)}`;
+      const capitalSource = source?.charAt(0).toUpperCase() + source?.slice(1).replace('.', '');
+      const isUrl = label.includes('Url');
+      const hasSteps = source === Source.dialogflow && replacedKey.includes('Level');
+      const stepPlaceholder = `0.1 ${t('to')} 0.9`;
+
+      inputArr.push(
+        <div key={index} className={styles.input}>
+          <Input
+            type={isUrl ? 'url' : hasSteps ? 'number' : 'text'}
+            step={hasSteps ? 0.01 : undefined}
+            min={hasSteps ? 0.1 : undefined}
+            max={hasSteps ? 0.9 : undefined}
+            name={key}
+            value={valueTyped === 'string' || valueTyped === 'optionalString' ? '' : valueTyped}
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => setInput({...input, [keyTyped]: e.target.value})}
+            label={label}
+            placeholder={hasSteps ? stepPlaceholder : placeholder}
+            showLabelIcon
+            tooltipText={t(`inputTooltip${capitalSource}${toolTip}`)}
+            required={valueTyped !== 'optionalString'}
+            height={32}
+            fontClass="font-base"
+          />
+        </div>
+      );
+    });
+
+  return <>{inputArr}</>;
+};
diff --git a/frontend/control-center/src/pages/Connectors/ConfigureConnector/index.module.scss b/frontend/control-center/src/pages/Connectors/ConfigureConnector/index.module.scss
index 1845feb843..b87f14cde2 100644
--- a/frontend/control-center/src/pages/Connectors/ConfigureConnector/index.module.scss
+++ b/frontend/control-center/src/pages/Connectors/ConfigureConnector/index.module.scss
@@ -1,3 +1,25 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.formRow {
+  height: 80px;
+  margin-bottom: 16px;
+
+  label {
+    @include font-s;
+  }
+
+  &:hover {
+    .actionToolTip {
+      display: block;
+    }
+  }
+
+  button {
+    margin-top: 16px;
+  }
+}
+
 .formWrapper {
   align-self: center;
 }
diff --git a/frontend/control-center/src/pages/Connectors/ConfigureConnector/index.tsx b/frontend/control-center/src/pages/Connectors/ConfigureConnector/index.tsx
index a615d5ea73..4345731464 100644
--- a/frontend/control-center/src/pages/Connectors/ConfigureConnector/index.tsx
+++ b/frontend/control-center/src/pages/Connectors/ConfigureConnector/index.tsx
@@ -1,51 +1,102 @@
-import React, {SetStateAction} from 'react';
+import React, {useState} from 'react';
 import RestartPopUp from '../RestartPopUp';
 import {SmartButton} from 'components';
 import {cyConnectorAddButton} from 'handles';
 import {useTranslation} from 'react-i18next';
 import styles from './index.module.scss';
+import {connect, ConnectedProps} from 'react-redux';
+import {StateModel} from '../../../reducers';
+import {SetConfigInputs} from './SetConfigInputs/SetConfigInputs';
+import {removePrefix} from '../../../services';
+import {updateConnectorConfiguration} from '../../../actions';
+import {UpdateComponentConfigurationRequestPayload} from 'httpclient/src';
 
-interface ConfigureConnectorProps {
-  children: JSX.Element[] | JSX.Element;
+const mapStateToProps = (state: StateModel) => {
+  return {
+    config: state.data.connector,
+  };
+};
+
+const mapDispatchToProps = {
+  updateConnectorConfiguration,
+};
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
+
+type ConfigureConnectorProps = {
   componentName: string;
-  isUpdateModalVisible: boolean;
-  setIsUpdateModalVisible: React.Dispatch<SetStateAction<boolean>>;
-  enableSubmitConfigData: () => void;
-  disabled: boolean;
+  isEnabled: boolean;
   isConfigured: boolean;
-  updateConfig: (e: React.FormEvent) => void;
-  isPending: boolean;
-}
-
-export const ConfigureConnector = ({
-  children,
-  componentName,
-  isUpdateModalVisible,
-  setIsUpdateModalVisible,
-  enableSubmitConfigData,
-  disabled,
-  isConfigured,
-  updateConfig,
-  isPending,
-}: ConfigureConnectorProps) => {
+  configValues: {[key: string]: string};
+  source: string;
+} & ConnectedProps<typeof connector>;
+
+const ConfigureConnector = (props: ConfigureConnectorProps) => {
+  const {componentName, isConfigured, configValues, isEnabled, updateConnectorConfiguration, source} = props;
   const {t} = useTranslation();
+  const displayName = componentName && removePrefix(componentName);
+  const [config, setConfig] = useState(configValues);
+  const [isPending, setIsPending] = useState(false);
+  const [isUpdateModalVisible, setIsUpdateModalVisible] = useState(false);
+
+  const updateConfig = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    if (isEnabled) {
+      setIsUpdateModalVisible(true);
+    } else {
+      enableSubmitConfigData();
+    }
+  };
+
+  const enableSubmitConfigData = () => {
+    config && createNewConnection(config);
+  };
+
+  const createNewConnection = (configurationValues: {}) => {
+    setIsPending(true);
+
+    const payload: UpdateComponentConfigurationRequestPayload = {
+      components: [
+        {
+          name: componentName && removePrefix(componentName),
+          enabled: true,
+          data: configurationValues,
+        },
+      ],
+    };
+
+    updateConnectorConfiguration(payload)
+      .catch((error: Error) => {
+        console.error(error);
+      })
+      .finally(() => {
+        setIsPending(false);
+      });
+  };
 
   return (
     <section className={styles.formWrapper}>
       <div className={styles.settings}>
         <form>
-          {children}
-          <SmartButton
-            height={40}
-            width={260}
-            title={isConfigured ? t('Update') : t('configure')}
-            pending={isPending}
-            styleVariant="small"
-            type="button"
-            disabled={disabled}
-            onClick={(e: React.FormEvent) => updateConfig(e)}
-            dataCy={cyConnectorAddButton}
-          />
+          <div className={styles.formRow}>
+            <SetConfigInputs
+              configurationValues={configValues}
+              storedConfig={props.config[displayName]}
+              setConfig={setConfig}
+              source={source}
+            />
+            <SmartButton
+              height={40}
+              width={260}
+              title={isConfigured ? t('Update') : t('configure')}
+              pending={isPending}
+              styleVariant="small"
+              type="button"
+              disabled={false}
+              onClick={e => updateConfig(e)}
+              dataCy={cyConnectorAddButton}
+            />
+          </div>
         </form>
       </div>
       {isUpdateModalVisible && (
@@ -58,3 +109,5 @@ export const ConfigureConnector = ({
     </section>
   );
 };
+
+export default connector(ConfigureConnector);
diff --git a/frontend/control-center/src/pages/Connectors/ConnectChannelModal/ConnectChannelModal.module.scss b/frontend/control-center/src/pages/Connectors/ConnectChannelModal/ConnectChannelModal.module.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frontend/control-center/src/pages/Connectors/ConnectChannelModal/ConnectChannelModal.tsx b/frontend/control-center/src/pages/Connectors/ConnectChannelModal/ConnectChannelModal.tsx
new file mode 100644
index 0000000000..8808ac3c06
--- /dev/null
+++ b/frontend/control-center/src/pages/Connectors/ConnectChannelModal/ConnectChannelModal.tsx
@@ -0,0 +1,42 @@
+import {Source} from 'model';
+import React from 'react';
+import ConnectNewChatPlugin from '../Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin';
+import FacebookConnect from '../Providers/Facebook/Messenger/FacebookConnect';
+import GoogleConnect from '../Providers/Google/GoogleConnect';
+import TwilioConnect from '../Providers/Twilio/TwilioConnect';
+import ViberConnect from '../Providers/Viber/ViberConnect';
+import WhatsappConnect from '../Providers/WhatsappBusinessCloud/WhatsappConnect';
+import styles from './ConnectChannelModal.module.scss';
+
+type ConnectChannelModaProps = {
+  source: Source;
+};
+
+export const ConnectChannelModal = (props: ConnectChannelModaProps) => {
+  const {source} = props;
+
+  const InputValues = () => {
+    switch (source) {
+      case Source.chatPlugin:
+        return <ConnectNewChatPlugin modal />;
+      case Source.google:
+        return <GoogleConnect modal />;
+      case Source.facebook:
+        return <FacebookConnect modal />;
+      case Source.twilioSMS:
+        return <TwilioConnect modal />;
+      case Source.whatsapp:
+        return <WhatsappConnect modal />;
+      case Source.viber:
+        return <ViberConnect modal />;
+    }
+  };
+
+  return (
+    <div className={styles.wrapper}>
+      <div className={styles.inputContainer}>
+        <InputValues />
+      </div>
+    </div>
+  );
+};
diff --git a/frontend/control-center/src/pages/Connectors/ConnectedChannelsList/index.module.scss b/frontend/control-center/src/pages/Connectors/ConnectedChannelsList/index.module.scss
index f329780e3d..1718354a1b 100644
--- a/frontend/control-center/src/pages/Connectors/ConnectedChannelsList/index.module.scss
+++ b/frontend/control-center/src/pages/Connectors/ConnectedChannelsList/index.module.scss
@@ -169,6 +169,11 @@
   border-radius: 32px;
 }
 
+.connectChannelModalHeader {
+  @include font-xl;
+  margin-bottom: 28px;
+}
+
 @keyframes searchFieldAnimation {
   0% {
     width: 0px;
diff --git a/frontend/control-center/src/pages/Connectors/ConnectedChannelsList/index.tsx b/frontend/control-center/src/pages/Connectors/ConnectedChannelsList/index.tsx
index fa93e475e3..9f419a2d44 100644
--- a/frontend/control-center/src/pages/Connectors/ConnectedChannelsList/index.tsx
+++ b/frontend/control-center/src/pages/Connectors/ConnectedChannelsList/index.tsx
@@ -1,12 +1,12 @@
 import React, {useEffect, useMemo, useState} from 'react';
 import {connect, ConnectedProps, useSelector} from 'react-redux';
 import {listChannels} from '../../../actions/channel';
-import {useNavigate, useParams} from 'react-router-dom';
+import {useParams} from 'react-router-dom';
 import {sortBy} from 'lodash-es';
 import {StateModel} from '../../../reducers';
 import {allChannels} from '../../../selectors/channels';
 import {Channel, ScreenDimensions, Source} from 'model';
-import {SearchField} from 'components';
+import {SearchField, SettingsModal} from 'components';
 import {ReactComponent as SearchIcon} from 'assets/images/icons/search.svg';
 import {ReactComponent as PlusIcon} from 'assets/images/icons/plus.svg';
 import {ReactComponent as CloseIcon} from 'assets/images/icons/close.svg';
@@ -24,7 +24,7 @@ import ChannelsListItem from './ChannelsListItem';
 import {Pagination} from 'components';
 import {useAnimation} from 'render/services/useAnimation';
 import {useTranslation} from 'react-i18next';
-import {CONNECTORS_ROUTE} from '../../../routes/routes';
+import {ConnectChannelModal} from '../ConnectChannelModal/ConnectChannelModal';
 
 const mapDispatchToProps = {
   listChannels,
@@ -37,10 +37,9 @@ type ConnectedChannelsListProps = {
 } & ConnectedProps<typeof connector>;
 
 const ConnectedChannelsList = (props: ConnectedChannelsListProps) => {
-  const {listChannels, offset} = props;
+  const {offset} = props;
   const {source} = useParams();
   const {t} = useTranslation();
-  const navigate = useNavigate();
   const channels = useSelector((state: StateModel) => {
     return Object.values(allChannels(state)).filter((channel: Channel) => channel.source === source);
   });
@@ -50,6 +49,7 @@ const ConnectedChannelsList = (props: ConnectedChannelsListProps) => {
   const [animationAction, setAnimationAction] = useState(false);
   const [dataCyChannelList, setDataCyChannelList] = useState('');
   const [currentPage, setCurrentPage] = useState(1);
+  const [showNewConnectionModal, setShowNewConnectionModal] = useState(false);
   const screenDimensions: ScreenDimensions = {height: screen.height, width: screen.width};
   const ITEM_LINE_HEIGHT = 64;
   const MARGIN_TOP = 128;
@@ -57,8 +57,6 @@ const ConnectedChannelsList = (props: ConnectedChannelsListProps) => {
   const PAGINATION_HEIGHT = 54;
   const ADDITIONAL_SPACE = 60;
 
-  const path = `${CONNECTORS_ROUTE}/${source}/new`;
-
   const filteredChannels = channels.filter((channel: Channel) =>
     channel.metadata?.name?.toLowerCase().includes(searchText.toLowerCase())
   );
@@ -76,12 +74,6 @@ const ConnectedChannelsList = (props: ConnectedChannelsListProps) => {
     return filteredChannels.slice(firstPageIndex, lastPageIndex);
   }, [currentPage, listPageSize, channels.length, filteredChannels.length]);
 
-  useEffect(() => {
-    listChannels().catch((error: Error) => {
-      console.error(error);
-    });
-  }, []);
-
   useEffect(() => {
     getInfo();
   }, [source]);
@@ -143,7 +135,7 @@ const ConnectedChannelsList = (props: ConnectedChannelsListProps) => {
           </button>
           <button
             style={{display: 'flex', alignItems: 'center', justifyContent: 'center'}}
-            onClick={() => navigate(path)}
+            onClick={() => setShowNewConnectionModal(true)}
             data-cy={cyConnectorsAddNewButton}
           >
             <PlusIcon className={styles.plusIcon} />
@@ -174,6 +166,15 @@ const ConnectedChannelsList = (props: ConnectedChannelsListProps) => {
           </div>
         )}
       </div>
+      {showNewConnectionModal && (
+        <SettingsModal
+          title={t('createChannel')}
+          close={() => setShowNewConnectionModal(false)}
+          headerClassName={styles.connectChannelModalHeader}
+        >
+          <ConnectChannelModal source={source as Source} />
+        </SettingsModal>
+      )}
       {areConnectedChannels && (
         <Pagination
           totalCount={filteredChannels.length}
diff --git a/frontend/control-center/src/pages/Connectors/ConnectorConfig/index.module.scss b/frontend/control-center/src/pages/Connectors/ConnectorConfig/index.module.scss
index 5e75717245..85410c51ac 100644
--- a/frontend/control-center/src/pages/Connectors/ConnectorConfig/index.module.scss
+++ b/frontend/control-center/src/pages/Connectors/ConnectorConfig/index.module.scss
@@ -12,6 +12,7 @@
 
 .channelsLineItems {
   display: flex;
+  flex-direction: row;
 }
 
 .activeItem {
diff --git a/frontend/control-center/src/pages/Connectors/ConnectorConfig/index.tsx b/frontend/control-center/src/pages/Connectors/ConnectorConfig/index.tsx
index 0871ddc771..3b87169494 100644
--- a/frontend/control-center/src/pages/Connectors/ConnectorConfig/index.tsx
+++ b/frontend/control-center/src/pages/Connectors/ConnectorConfig/index.tsx
@@ -1,248 +1,144 @@
 import React, {useState, useEffect, useRef, useLayoutEffect} from 'react';
-import {connect, ConnectedProps, useSelector} from 'react-redux';
+import {connect, ConnectedProps} from 'react-redux';
 import {useTranslation} from 'react-i18next';
-import {useParams} from 'react-router-dom';
+import {useLocation, useNavigate, useParams} from 'react-router-dom';
 import {StateModel} from '../../../reducers';
-import {
-  connectChatPlugin,
-  updateChannel,
-  disconnectChannel,
-  updateConnectorConfiguration,
-  enableDisableComponent,
-  getConnectorsConfiguration,
-  listComponents,
-} from '../../../actions';
-import {UpdateComponentConfigurationRequestPayload} from 'httpclient/src';
-import {Source, ComponentInfo} from 'model';
-
+import {getMergedConnectors, useCurrentComponentForSource} from '../../../selectors';
+import {getConnectorsConfiguration, listComponents} from '../../../actions';
+import {Source} from 'model';
 import ChatPluginConnect from '../Providers/Airy/ChatPlugin/ChatPluginConnect';
 import FacebookConnect from '../Providers/Facebook/Messenger/FacebookConnect';
 import InstagramConnect from '../Providers/Instagram/InstagramConnect';
 import GoogleConnect from '../Providers/Google/GoogleConnect';
 import TwilioSmsConnect from '../Providers/Twilio/SMS/TwilioSmsConnect';
 import TwilioWhatsappConnect from '../Providers/Twilio/WhatsApp/TwilioWhatsappConnect';
-import {DialogflowConnect} from '../Providers/Dialogflow/DialogflowConnect';
-import {ConnectNewZendesk} from '../Providers/Zendesk/ConnectNewZendesk';
-import {ConnectNewSalesforce} from '../Providers/Salesforce/ConnectNewSalesforce';
-import {RasaConnect} from '../Providers/Rasa/RasaConnect';
-import {WhatsappBusinessCloudConnect} from '../Providers/WhatsappBusinessCloud/WhatsappBusinessCloudConnect';
-
 import ConnectedChannelsList from '../ConnectedChannelsList';
 import {removePrefix} from '../../../services';
 import styles from './index.module.scss';
-
-export enum Pages {
-  createUpdate = 'create-update',
-  customization = 'customization',
-  install = 'install',
-}
+import ConfigureConnector from '../ConfigureConnector';
+import {CONNECTORS_ROUTE} from '../../../routes/routes';
+import WhatsappConnect from '../Providers/WhatsappBusinessCloud/WhatsappConnect';
+import ViberConnect from '../Providers/Viber/ViberConnect';
 
 const mapDispatchToProps = {
-  connectChatPlugin,
-  updateChannel,
-  disconnectChannel,
-  updateConnectorConfiguration,
-  enableDisableComponent,
   getConnectorsConfiguration,
   listComponents,
 };
 
 const mapStateToProps = (state: StateModel) => ({
   components: state.data.config.components,
-  catalog: state.data.catalog,
+  connectors: getMergedConnectors(state),
 });
 
+type LocationState = {
+  from: string;
+};
+
 const connector = connect(mapStateToProps, mapDispatchToProps);
 
 const ConnectorConfig = (props: ConnectedProps<typeof connector>) => {
-  const {components, catalog, updateConnectorConfiguration, getConnectorsConfiguration, listComponents} = props;
-
-  const connectors = useSelector((state: StateModel) => state.data.connector);
-  const [connectorInfo, setConnectorInfo] = useState<ComponentInfo | null>(null);
-  const [currentPage] = useState(Pages.createUpdate);
-  const [isEnabled, setIsEnabled] = useState<boolean | null>(null);
-  const [isPending, setIsPending] = useState(false);
-  const [isConfigured, setIsConfigured] = useState(false);
-  const [lineTitle, setLineTitle] = useState('');
-
-  const pageContentRef = useRef(null);
-  const [offset, setOffset] = useState(pageContentRef?.current?.offsetTop);
-
+  const {components, connectors, getConnectorsConfiguration, listComponents} = props;
   const {t} = useTranslation();
-
   const params = useParams();
+  const navigate = useNavigate();
+  const location = useLocation();
   const {channelId, source} = params;
   const newChannel = params['*'] === 'new';
-  const connectedParams = params['*'] === 'connected';
-
+  const connectedChannels = params['*'] === 'connected';
+  const configurePath = params['*'] === 'configure';
+  const connectorInfo = useCurrentComponentForSource(source as Source);
+  const [isEnabled, setIsEnabled] = useState<boolean | null>(null);
+  const [lineTitle, setLineTitle] = useState('');
+  const [lineTitleRoute, setLineTitleRoute] = useState('');
+  const configValues = connectorInfo.source === source && connectorInfo.configurationValues;
+  const parsedConfigValues = configValues && JSON.parse(configValues);
+  const pageContentRef = useRef(null);
+  const [offset, setOffset] = useState(pageContentRef?.current?.offsetTop);
   const isAiryInternalConnector = source === Source.chatPlugin;
-  const isCatalogList = Object.entries(catalog).length > 0;
+  const previousPath = (location.state as LocationState)?.from;
+  const currentPath = params['*'];
+  const navigateNew = `${CONNECTORS_ROUTE}/${source}/new`;
+  const navigateConnected = `${CONNECTORS_ROUTE}/${source}/connected`;
+  const navigateConfigure = `${CONNECTORS_ROUTE}/${source}/configure`;
+  const navigateChannelId = `${CONNECTORS_ROUTE}/${source}/${channelId || previousPath}`;
+  const notConfigured = previousPath === 'connectors' || previousPath === 'status' || previousPath === 'catalog';
+  const hasConnectedChannels = connectors[removePrefix(connectorInfo?.name)].connectedChannels > 0;
+  const isChannel = connectors[removePrefix(connectorInfo?.name)].isChannel;
+  const isConfigured = connectors[removePrefix(connectorInfo?.name)].isConfigured;
 
   useLayoutEffect(() => {
     setOffset(pageContentRef?.current?.offsetTop);
     listComponents().catch((error: Error) => {
       console.error(error);
     });
-  }, []);
-
-  useEffect(() => {
-    if (connectorInfo && connectors) {
-      if (
-        connectors[removePrefix(connectorInfo.name)] &&
-        Object.keys(connectors[removePrefix(connectorInfo.name)]).length > 0
-      ) {
-        setIsConfigured(true);
-      }
-    }
-  }, [connectorInfo, connectors]);
-
-  useEffect(() => {
     getConnectorsConfiguration().catch((error: Error) => {
       console.error(error);
     });
+  }, []);
 
-    if (isCatalogList) {
-      isAiryInternalConnector && setIsConfigured(true);
-
-      const connectorSourceInfo = Object.entries(catalog).filter(item => item[1].source === source);
-
-      const connectorSourceInfoArr: [string, ComponentInfo] = connectorSourceInfo[0];
-      const connectorSourceInfoFormatted = {name: connectorSourceInfoArr[0], ...connectorSourceInfoArr[1]};
-
-      const connectorHasChannels: undefined | string = connectorSourceInfoFormatted?.isChannel;
-
-      determineLineTitle(connectorHasChannels);
-      setConnectorInfo(connectorSourceInfoFormatted);
-    }
-  }, [source, isCatalogList, params]);
+  useEffect(() => {
+    if (connectorInfo) determineLineTitle();
+  }, [connectorInfo]);
 
   useEffect(() => {
-    if (components && connectorInfo) setIsEnabled(components[removePrefix(connectorInfo.name)]?.enabled);
+    if (components && connectorInfo && connectorInfo?.name)
+      setIsEnabled(components[removePrefix(connectorInfo.name)]?.enabled);
   }, [connectorInfo, components]);
 
-  const determineLineTitle = (connectorHasChannels: undefined | string) => {
+  const determineLineTitle = () => {
     const newAiryChatPluginPage = newChannel && source === Source.chatPlugin;
-    const newChannelPage = newChannel && connectorHasChannels;
+
+    if (channelId || previousPath?.includes('-')) {
+      setLineTitle(t('update'));
+      setLineTitleRoute(navigateChannelId);
+      return;
+    }
 
     if (newAiryChatPluginPage) {
       setLineTitle(t('create'));
       return;
     }
 
-    if (newChannelPage) {
+    if (configurePath && !isChannel) {
+      setLineTitle(t('configuration'));
+      return;
+    }
+
+    if (newChannel || !hasConnectedChannels) {
       setLineTitle(t('addChannel'));
+      setLineTitleRoute(navigateNew);
       return;
     }
 
-    if (connectedParams) {
+    if (connectedChannels || hasConnectedChannels) {
       setLineTitle(t('channelsCapital'));
+      setLineTitleRoute(navigateConnected);
       return;
     }
-
-    setLineTitle(t('configuration'));
-  };
-
-  const createNewConnection = (configurationValues: {[key: string]: string}) => {
-    setIsPending(true);
-
-    const payload: UpdateComponentConfigurationRequestPayload = {
-      components: [
-        {
-          name: connectorInfo && removePrefix(connectorInfo.name),
-          enabled: true,
-          data: configurationValues,
-        },
-      ],
-    };
-
-    updateConnectorConfiguration(payload)
-      .catch((error: Error) => {
-        console.error(error);
-      })
-      .finally(() => {
-        setIsPending(false);
-      });
   };
 
   const PageContent = () => {
-    if (newChannel || channelId) {
-      if (source === Source.dialogflow) {
-        return (
-          <DialogflowConnect
-            createNewConnection={createNewConnection}
-            isEnabled={isEnabled}
-            isConfigured={isConfigured}
-            isPending={isPending}
-          />
-        );
-      }
-
-      if (source === Source.zendesk) {
-        return (
-          <ConnectNewZendesk
-            createNewConnection={createNewConnection}
-            isEnabled={isEnabled}
-            isConfigured={isConfigured}
-            isPending={isPending}
-          />
-        );
-      }
-
-      if (source === Source.salesforce) {
-        return (
-          <ConnectNewSalesforce
-            createNewConnection={createNewConnection}
-            isEnabled={isEnabled}
-            isConfigured={isConfigured}
-            isPending={isPending}
-          />
-        );
-      }
-
-      if (source === Source.rasa) {
-        return (
-          <RasaConnect
-            createNewConnection={createNewConnection}
-            isEnabled={isEnabled}
-            isConfigured={isConfigured}
-            isPending={isPending}
-          />
-        );
-      }
-
-      if (source === Source.whatsapp) {
-        return (
-          <WhatsappBusinessCloudConnect
-            createNewConnection={createNewConnection}
-            isEnabled={isEnabled}
-            isConfigured={isConfigured}
-            isPending={isPending}
-          />
-        );
-      }
-
-      if (source === Source.chatPlugin) {
-        return <ChatPluginConnect />;
-      }
-      if (source === Source.facebook) {
-        return <FacebookConnect />;
-      }
-      if (source === Source.instagram) {
-        return <InstagramConnect />;
-      }
-      if (source === Source.google) {
-        return <GoogleConnect />;
-      }
-      if (source === Source.twilioSMS) {
-        return <TwilioSmsConnect />;
-      }
-      if (source === Source.twilioWhatsApp) {
-        return <TwilioWhatsappConnect />;
-      }
+    if (configurePath) {
+      return (
+        <ConfigureConnector
+          componentName={connectorInfo.name}
+          isEnabled={isEnabled}
+          isConfigured={isConfigured}
+          configValues={parsedConfigValues}
+          source={connectorInfo.source}
+        />
+      );
+    }
 
-      if (source === Source.viber) {
-        return <p>configuration page under construction - coming soon!</p>;
-      }
+    if (channelId || newChannel) {
+      if (source === Source.chatPlugin) return <ChatPluginConnect />;
+      if (source === Source.facebook) return <FacebookConnect />;
+      if (source === Source.instagram) return <InstagramConnect />;
+      if (source === Source.google) return <GoogleConnect />;
+      if (source === Source.whatsapp) return <WhatsappConnect />;
+      if (source === Source.twilioSMS) return <TwilioSmsConnect />;
+      if (source === Source.twilioWhatsApp) return <TwilioWhatsappConnect />;
+      if (source === Source.viber) return <ViberConnect />;
     }
 
     return <ConnectedChannelsList offset={offset} />;
@@ -253,9 +149,26 @@ const ConnectorConfig = (props: ConnectedProps<typeof connector>) => {
       {!(source === Source.chatPlugin && (newChannel || channelId)) && (
         <div className={styles.channelsLineContainer}>
           <div className={styles.channelsLineItems}>
-            <span className={currentPage === Pages.createUpdate ? styles.activeItem : styles.inactiveItem}>
-              {lineTitle}
-            </span>
+            {(!isConfigured || isAiryInternalConnector || !isChannel) && (
+              <span
+                className={
+                  connectedChannels || newChannel || channelId || (configurePath && !isChannel)
+                    ? styles.activeItem
+                    : styles.inactiveItem
+                }
+                onClick={() => isChannel && navigate(lineTitleRoute, {state: {from: currentPath}})}
+              >
+                {lineTitle}
+              </span>
+            )}
+            {((source !== Source.chatPlugin && connectorInfo.isChannel) || (notConfigured && isChannel)) && (
+              <span
+                className={configurePath ? styles.activeItem : styles.inactiveItem}
+                onClick={() => !configurePath && navigate(navigateConfigure, {state: {from: currentPath}})}
+              >
+                {t('configuration')}
+              </span>
+            )}
           </div>
           <div className={styles.line} />
         </div>
diff --git a/frontend/control-center/src/pages/Connectors/ConnectorWrapper/index.tsx b/frontend/control-center/src/pages/Connectors/ConnectorWrapper/index.tsx
index 8b383dcea9..88d9c71357 100644
--- a/frontend/control-center/src/pages/Connectors/ConnectorWrapper/index.tsx
+++ b/frontend/control-center/src/pages/Connectors/ConnectorWrapper/index.tsx
@@ -4,16 +4,9 @@ import {useTranslation} from 'react-i18next';
 import {Link, useParams} from 'react-router-dom';
 import {Button, NotificationComponent, SettingsModal, SmartButton} from 'components';
 import {StateModel} from '../../../reducers';
-import {
-  connectChatPlugin,
-  updateChannel,
-  disconnectChannel,
-  enableDisableComponent,
-  getConnectorsConfiguration,
-  listComponents,
-} from '../../../actions';
+import {enableDisableComponent, getConnectorsConfiguration, listComponents} from '../../../actions';
 import {LinkButton, InfoButton} from 'components';
-import {NotificationModel, Source, ComponentInfo} from 'model';
+import {NotificationModel, Source, ComponentInfo, Channel} from 'model';
 import {ConfigStatusButton} from '../ConfigStatusButton';
 import {getComponentStatus, removePrefix} from '../../../services';
 import {DescriptionComponent, getDescriptionSourceName, getChannelAvatar} from '../../../components';
@@ -21,11 +14,9 @@ import {CONNECTORS_ROUTE} from '../../../routes/routes';
 import {ReactComponent as CheckmarkIcon} from 'assets/images/icons/checkmarkFilled.svg';
 import {ReactComponent as ArrowLeftIcon} from 'assets/images/icons/leftArrowCircle.svg';
 import styles from './index.module.scss';
+import {allChannelsConnected} from '../../../selectors';
 
 const mapDispatchToProps = {
-  connectChatPlugin,
-  updateChannel,
-  disconnectChannel,
   enableDisableComponent,
   getConnectorsConfiguration,
   listComponents,
@@ -35,6 +26,7 @@ const mapStateToProps = (state: StateModel) => ({
   config: state.data.config,
   components: state.data.config.components,
   catalog: state.data.catalog,
+  connectors: state.data.connector,
 });
 
 const connector = connect(mapStateToProps, mapDispatchToProps);
@@ -44,12 +36,21 @@ type ConnectorWrapperProps = {
 } & ConnectedProps<typeof connector>;
 
 const ConnectorWrapper = (props: ConnectorWrapperProps) => {
-  const {components, catalog, enableDisableComponent, getConnectorsConfiguration, listComponents, config, Outlet} =
-    props;
+  const {
+    components,
+    catalog,
+    connectors,
+    enableDisableComponent,
+    getConnectorsConfiguration,
+    listComponents,
+    config,
+    Outlet,
+  } = props;
 
-  const connectors = useSelector((state: StateModel) => state.data.connector);
   const [connectorInfo, setConnectorInfo] = useState<ComponentInfo | null>(null);
   const componentName = connectorInfo && removePrefix(connectorInfo?.name);
+  const channels = useSelector((state: StateModel) => Object.values(allChannelsConnected(state)));
+  const channelsBySource = (Source: Source) => channels.filter((channel: Channel) => channel?.source === Source);
   const [configurationModal, setConfigurationModal] = useState(false);
   const [notification, setNotification] = useState<NotificationModel>(null);
   const [isEnabled, setIsEnabled] = useState<boolean | null>(components[connectorInfo && componentName]?.enabled);
@@ -115,7 +116,8 @@ const ConnectorWrapper = (props: ConnectorWrapperProps) => {
   }, [config, connectorInfo, components]);
 
   const determineBackRoute = (channelId: string, newChannel: boolean, connectorHasChannels: string | undefined) => {
-    const channelRoute = (channelId || newChannel) && connectorHasChannels;
+    const channelRoute =
+      (channelId || newChannel) && connectorHasChannels && channelsBySource(connectorInfo?.source).length > 0;
 
     if (channelRoute) {
       setBackRoute(CONNECTOR_CONNECTED_ROUTE);
@@ -199,7 +201,6 @@ const ConnectorWrapper = (props: ConnectorWrapperProps) => {
                       text={t('infoButtonText')}
                     />
                   </div>
-
                   {isConfigured && (
                     <SmartButton
                       title={isEnabled ? t('disableComponent') : t('enableComponent')}
diff --git a/frontend/control-center/src/pages/Connectors/EmptyStateConnectors/index.module.scss b/frontend/control-center/src/pages/Connectors/EmptyStateConnectors/index.module.scss
index ff457f0e04..5cde9224b9 100644
--- a/frontend/control-center/src/pages/Connectors/EmptyStateConnectors/index.module.scss
+++ b/frontend/control-center/src/pages/Connectors/EmptyStateConnectors/index.module.scss
@@ -14,11 +14,13 @@
     font-weight: 800;
     margin-top: 32px;
     margin-bottom: 32px;
+    color: var(--color-text-contrast);
   }
 
   p {
     @include font-m;
     text-align: center;
+    color: var(--color-text-gray);
   }
 }
 
diff --git a/frontend/control-center/src/pages/Connectors/InfoCard/index.tsx b/frontend/control-center/src/pages/Connectors/InfoCard/index.tsx
index 46ce40d224..b3775278e1 100644
--- a/frontend/control-center/src/pages/Connectors/InfoCard/index.tsx
+++ b/frontend/control-center/src/pages/Connectors/InfoCard/index.tsx
@@ -3,14 +3,14 @@ import {useNavigate} from 'react-router-dom';
 import {installComponent, uninstallComponent} from '../../../actions/catalog';
 import {connect, ConnectedProps} from 'react-redux';
 import {ConfigStatusButton} from '../ConfigStatusButton';
-import {ComponentStatus} from '..';
+import {ComponentStatus} from 'model';
 import {getChannelAvatar} from '../../../components/ChannelAvatar';
-import {ConnectorCardComponentInfo} from '../index';
 import {getNewChannelRouteForComponent} from '../../../services';
 import styles from './index.module.scss';
+import {Connector} from 'model';
 
 type InfoCardProps = {
-  componentInfo: ConnectorCardComponentInfo;
+  componentInfo: Connector;
   componentStatus?: ComponentStatus;
 } & ConnectedProps<typeof connector>;
 
@@ -37,7 +37,9 @@ const InfoCard = (props: InfoCardProps) => {
           {getChannelAvatar(componentInfo.source)}
           {componentInfo.displayName}
         </div>
-        {componentStatus && <ConfigStatusButton componentStatus={componentStatus} />}
+        {componentStatus && (
+          <ConfigStatusButton componentStatus={componentStatus} configurationRoute={CONFIGURATION_ROUTE} />
+        )}
       </div>
     </div>
   );
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/ChatPluginConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/ChatPluginConnect.tsx
index 3a79078634..ea96a41e1a 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/ChatPluginConnect.tsx
+++ b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/ChatPluginConnect.tsx
@@ -12,7 +12,7 @@ import {cyChannelCreatedChatPluginCloseButton} from 'handles';
 import {Button, LinkButton, NotificationComponent, SettingsModal} from 'components';
 import {Channel, NotificationModel, Source, ChatpluginConfig, DefaultConfig} from 'model';
 
-import {ConnectNewChatPlugin} from './sections/ConnectNewChatPlugin';
+import ConnectNewChatPlugin from './sections/ConnectNewChatPlugin';
 
 import {ReactComponent as AiryAvatarIcon} from 'assets/images/icons/airyAvatar.svg';
 import {ReactComponent as CheckmarkIcon} from 'assets/images/icons/checkmarkFilled.svg';
@@ -61,23 +61,6 @@ const ChatPluginConnect = (props: ConnectedProps<typeof connector>) => {
   const {t} = useTranslation();
   const CHAT_PLUGIN_ROUTE = `${CONNECTORS_ROUTE}/chatplugin`;
 
-  const createNewConnection = (displayName: string, imageUrl?: string) => {
-    props
-      .connectChatPlugin({
-        name: displayName,
-        ...(imageUrl.length > 0 && {
-          imageUrl: imageUrl,
-        }),
-      })
-      .then((id: string) => {
-        setCurrentChannelId(id);
-        setShowCreatedModal(true);
-      })
-      .catch((error: Error) => {
-        console.error(error);
-      });
-  };
-
   const disconnectChannel = (channel: Channel) => {
     if (window.confirm(t('deleteChannel'))) {
       props.disconnectChannel({source: 'chatplugin', channelId: channel.id}).catch((error: Error) => {
@@ -111,11 +94,16 @@ const ChatPluginConnect = (props: ConnectedProps<typeof connector>) => {
     navigate(`${CONNECTORS_ROUTE}/${Source.chatPlugin}/connected`);
   };
 
+  const handleNewConnection = (id: string, showModal: boolean) => {
+    setCurrentChannelId(id);
+    setShowCreatedModal(showModal);
+  };
+
   const PageContent = () => {
     switch (currentPage) {
       case Pages.createUpdate:
         if (newChannel) {
-          return <ConnectNewChatPlugin createNewConnection={createNewConnection} />;
+          return <ConnectNewChatPlugin connectNew={handleNewConnection} />;
         }
         if (channelId?.length > 0) {
           return (
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin.module.scss
index 3c4f80aa7e..2dc45d65b1 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin.module.scss
+++ b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin.module.scss
@@ -1,23 +1,20 @@
-.newPageParagraph {
-  margin: 24px 0;
-  color: var(--color-text-gray);
-}
-
 .formWrapper {
-  width: 340px;
-  align-self: center;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  align-items: flex-start;
+  button {
+    margin-top: 32px;
+  }
 }
 
-.formRow {
-  margin-bottom: 16px;
-
-  &:hover {
-    .actionToolTip {
-      display: block;
-    }
-  }
+.formWrapperModal {
+  @extend .formWrapper;
+  align-items: center;
 }
 
-.settings {
-  width: 20rem;
+.formRow {
+  height: 82px;
+  width: 75%;
+  max-width: 20rem;
 }
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin.tsx b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin.tsx
index b30560d2ee..d6c9f6a088 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin.tsx
+++ b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/ConnectNewChatPlugin.tsx
@@ -3,71 +3,94 @@ import {useTranslation} from 'react-i18next';
 import {Button, Input} from 'components';
 import {cyChannelsChatPluginFormNameInput, cyChannelsChatPluginFormSubmitButton} from 'handles';
 import styles from './ConnectNewChatPlugin.module.scss';
+import {connectChatPlugin} from '../../../../../../actions/channel';
+import {connect, ConnectedProps} from 'react-redux';
+import {useNavigate} from 'react-router-dom';
+import {CONNECTORS_ROUTE} from '../../../../../../routes/routes';
 
-interface ConnectNewChatPluginProps {
-  createNewConnection: (displayName: string, imageUrl?: string) => void;
-}
+const mapDispatchToProps = {
+  connectChatPlugin,
+};
+
+const connector = connect(null, mapDispatchToProps);
 
-export const ConnectNewChatPlugin = (props: ConnectNewChatPluginProps) => {
-  const {createNewConnection} = props;
+type ConnectNewChatPluginProps = {
+  modal?: boolean;
+  connectNew?: (id: string, showModal: boolean) => void;
+} & ConnectedProps<typeof connector>;
+
+const ConnectNewChatPlugin = (props: ConnectNewChatPluginProps) => {
+  const {modal, connectNew, connectChatPlugin} = props;
   const [displayName, setDisplayName] = useState('');
   const [imageUrl, setImageUrl] = useState('');
   const {t} = useTranslation();
+  const navigate = useNavigate();
+  const CHAT_PLUGIN_ROUTE = `${CONNECTORS_ROUTE}/chatplugin`;
 
-  return (
-    <div>
-      <div className={styles.formWrapper}>
-        <div className={styles.settings}>
-          <form>
-            <div className={styles.formRow}>
-              <Input
-                type="text"
-                name="displayName"
-                value={displayName}
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setDisplayName(e.target.value);
-                }}
-                label={t('displayName')}
-                placeholder={t('addDisplayName')}
-                required
-                height={32}
-                fontClass="font-base"
-                dataCy={cyChannelsChatPluginFormNameInput}
-              />
-            </div>
+  const createNewConnection = (displayName: string, imageUrl?: string) => {
+    connectChatPlugin({
+      name: displayName,
+      ...(imageUrl.length > 0 && {
+        imageUrl: imageUrl,
+      }),
+    })
+      .then((id: string) => {
+        modal ? navigate(`${CHAT_PLUGIN_ROUTE}/${id}`) : connectNew(id, true);
+      })
+      .catch((error: Error) => {
+        console.error(error);
+      });
+  };
 
-            <div className={styles.formRow}>
-              <Input
-                type="url"
-                name="url"
-                value={imageUrl}
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setImageUrl(e.target.value);
-                }}
-                label={t('imageUrl')}
-                showLabelIcon
-                tooltipText={t('imageUrlHint')}
-                placeholder={t('imageUrlPlaceholder')}
-                height={32}
-                fontClass="font-base"
-              />
-            </div>
-            <Button
-              type="submit"
-              styleVariant="small"
-              disabled={displayName === ''}
-              style={{width: '176px', height: '40px'}}
-              dataCy={cyChannelsChatPluginFormSubmitButton}
-              onClick={(event: React.FormEvent<HTMLFormElement>) => {
-                event.preventDefault();
-                createNewConnection(displayName, imageUrl);
-              }}
-            >
-              {t('create')}
-            </Button>
-          </form>
-        </div>
+  return (
+    <form className={modal ? styles.formWrapperModal : styles.formWrapper}>
+      <div className={styles.formRow}>
+        <Input
+          type="text"
+          name="displayName"
+          value={displayName}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setDisplayName(e.target.value);
+          }}
+          label={t('displayName')}
+          placeholder={t('addDisplayName')}
+          required
+          height={32}
+          fontClass="font-base"
+          dataCy={cyChannelsChatPluginFormNameInput}
+        />
+      </div>
+      <div className={styles.formRow}>
+        <Input
+          type="url"
+          name="url"
+          value={imageUrl}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setImageUrl(e.target.value);
+          }}
+          label={t('imageUrl')}
+          showLabelIcon
+          tooltipText={t('imageUrlHint')}
+          placeholder={t('imageUrlPlaceholder')}
+          height={32}
+          fontClass="font-base"
+        />
       </div>
-    </div>
+      <Button
+        type="submit"
+        styleVariant="small"
+        disabled={displayName === ''}
+        style={{width: '176px', height: '40px'}}
+        dataCy={cyChannelsChatPluginFormSubmitButton}
+        onClick={(event: React.FormEvent<HTMLFormElement>) => {
+          event.preventDefault();
+          createNewConnection(displayName, imageUrl);
+        }}
+      >
+        {t('create')}
+      </Button>
+    </form>
   );
 };
+
+export default connector(ConnectNewChatPlugin);
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/CreateUpdateSection/CreateUpdateSection.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/CreateUpdateSection/CreateUpdateSection.module.scss
index 8627ca430b..cd8a2a4971 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/CreateUpdateSection/CreateUpdateSection.module.scss
+++ b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/CreateUpdateSection/CreateUpdateSection.module.scss
@@ -1,8 +1,33 @@
 .formWrapper {
   align-self: center;
   display: flex;
+  flex-direction: column;
+  width: 100%;
 }
 
-.settings {
+.inputContainer {
   width: 20rem;
+  .input {
+    height: 82px;
+    width: 75%;
+  }
+}
+
+.inputContainerModal {
+  @extend .inputContainer;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  .input {
+    height: 82px;
+    width: 75%;
+  }
+}
+
+.smartButtonContainer {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  margin-top: 32px;
 }
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/CreateUpdateSection/CreateUpdateSection.tsx b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/CreateUpdateSection/CreateUpdateSection.tsx
index 0e8d608e20..d0bd7870f6 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/CreateUpdateSection/CreateUpdateSection.tsx
+++ b/frontend/control-center/src/pages/Connectors/Providers/Airy/ChatPlugin/sections/CreateUpdateSection/CreateUpdateSection.tsx
@@ -14,25 +14,26 @@ const mapDispatchToProps = {
 const connector = connect(null, mapDispatchToProps);
 
 type InstallUpdateSectionProps = {
-  channel: Channel;
-  displayName: string;
-  imageUrl: string;
-  setNotification: Dispatch<SetStateAction<NotificationModel>>;
+  channel?: Channel;
+  displayName?: string;
+  imageUrl?: string;
+  setNotification?: Dispatch<SetStateAction<NotificationModel>>;
+  modal?: boolean;
 } & ConnectedProps<typeof connector>;
 
 const CreateUpdateSection = (props: InstallUpdateSectionProps) => {
-  const {channel, displayName, imageUrl, setNotification} = props;
+  const {channel, displayName, imageUrl, setNotification, modal} = props;
 
   const [submit, setSubmit] = useState(false);
-  const [newDisplayName, setNewDisplayName] = useState(displayName || channel?.metadata?.name);
-  const [newImageUrl, setNewImageUrl] = useState(imageUrl || channel?.metadata?.imageUrl);
+  const [newDisplayName, setNewDisplayName] = useState(displayName || channel?.metadata?.name || '');
+  const [newImageUrl, setNewImageUrl] = useState(imageUrl || channel?.metadata?.imageUrl || '');
   const [isPending, setIsPending] = useState(false);
   const {t} = useTranslation();
 
   const updateConnection = (displayName: string, imageUrl?: string) => {
     setIsPending(true);
     props
-      .updateChannel({channelId: channel.id, name: displayName, imageUrl: imageUrl})
+      .updateChannel({channelId: channel?.id, name: displayName, imageUrl: imageUrl})
       .then(() => {
         setNotification({show: true, text: t('updateSuccessful'), successful: true});
       })
@@ -46,60 +47,60 @@ const CreateUpdateSection = (props: InstallUpdateSectionProps) => {
   };
 
   return (
-    <div className={styles.formWrapper}>
-      <div className={styles.settings}>
-        <form
-          onSubmit={(event: React.FormEvent<HTMLFormElement>) => {
-            event.preventDefault();
-            submit && updateConnection(newDisplayName, newImageUrl);
-          }}
-        >
-          <div className={styles.formRow}>
-            <Input
-              type="text"
-              name="displayName"
-              value={newDisplayName}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setNewDisplayName(e.target.value);
-              }}
-              label={t('displayName')}
-              placeholder={t('addAName')}
-              required
-              height={32}
-              fontClass="font-base"
-              dataCy={cyChannelsChatPluginFormNameInput}
-            />
-          </div>
-
-          <div className={styles.formRow}>
-            <Input
-              type="url"
-              name="url"
-              value={newImageUrl}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setNewImageUrl(e.target.value);
-              }}
-              label={t('imageUrl')}
-              placeholder={t('imageUrlPlaceholder')}
-              showLabelIcon
-              tooltipText={t('imageUrlHint')}
-              height={32}
-              fontClass="font-base"
-            />
-          </div>
-          <SmartButton
-            title={t('update')}
-            height={40}
-            width={160}
-            onClick={() => setSubmit(true)}
-            pending={isPending}
-            type="submit"
-            styleVariant="small"
-            disabled={newDisplayName === '' || newDisplayName === displayName || isPending}
+    <form
+      className={styles.formWrapper}
+      onSubmit={(event: React.FormEvent<HTMLFormElement>) => {
+        event.preventDefault();
+        submit && updateConnection(newDisplayName, newImageUrl);
+      }}
+    >
+      <div className={modal ? styles.inputContainerModal : styles.inputContainer}>
+        <div className={styles.input}>
+          <Input
+            type="text"
+            name="displayName"
+            value={newDisplayName}
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+              setNewDisplayName(e.target.value);
+            }}
+            label={t('displayName')}
+            placeholder={t('addAName')}
+            required
+            height={32}
+            fontClass="font-base"
+            dataCy={cyChannelsChatPluginFormNameInput}
+          />
+        </div>
+        <div className={styles.input}>
+          <Input
+            type="url"
+            name="url"
+            value={newImageUrl}
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+              setNewImageUrl(e.target.value);
+            }}
+            label={t('imageUrl')}
+            placeholder={t('imageUrlPlaceholder')}
+            showLabelIcon
+            tooltipText={t('imageUrlHint')}
+            height={32}
+            fontClass="font-base"
           />
-        </form>
+        </div>
+      </div>
+      <div className={styles.smartButtonContainer} style={modal ? {justifyContent: 'center'} : {}}>
+        <SmartButton
+          title={t('update')}
+          height={40}
+          width={160}
+          onClick={() => setSubmit(true)}
+          pending={isPending}
+          type="submit"
+          styleVariant="small"
+          disabled={newDisplayName === '' || newDisplayName === displayName || isPending}
+        />
       </div>
-    </div>
+    </form>
   );
 };
 
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Dialogflow/DialogflowConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/Dialogflow/DialogflowConnect.tsx
deleted file mode 100644
index fcd39c800d..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/Dialogflow/DialogflowConnect.tsx
+++ /dev/null
@@ -1,218 +0,0 @@
-import React, {useState} from 'react';
-import {useSelector} from 'react-redux';
-import {StateModel} from '../../../../reducers';
-import {Input} from 'components';
-import {ConfigureConnector} from '../../ConfigureConnector';
-import styles from './index.module.scss';
-import {useTranslation} from 'react-i18next';
-import {ComponentName} from 'model';
-
-interface ConnectParams {
-  [key: string]: string;
-}
-
-type DialogflowConnectProps = {
-  createNewConnection: (configValues: ConnectParams) => void;
-  isEnabled: boolean;
-  isConfigured: boolean;
-  isPending: boolean;
-  componentName?: string;
-};
-
-export const DialogflowConnect = ({
-  createNewConnection,
-  isEnabled,
-  isConfigured,
-  isPending,
-}: DialogflowConnectProps) => {
-  const componentInfo = useSelector(
-    (state: StateModel) => state.data.connector[ComponentName.enterpriseDialogflowConnector]
-  );
-
-  const [projectId, setProjectID] = useState(componentInfo?.projectId);
-  const [dialogflowCredentials, setDialogflowCredentials] = useState(componentInfo?.dialogflowCredentials || '');
-  const [suggestionConfidenceLevel, setSuggestionConfidenceLevel] = useState(
-    componentInfo?.suggestionConfidenceLevel || ''
-  );
-  const [replyConfidenceLevel, setReplyConfidenceLevel] = useState(componentInfo?.replyConfidenceLevel || '');
-  const [isUpdateModalVisible, setIsUpdateModalVisible] = useState(false);
-  const [processorWaitingTime, setProcessorWaitingTime] = useState(
-    componentInfo?.connectorStoreMessagesProcessorMaxWaitMillis || '5000'
-  );
-  const [processorCheckPeriod, setProcessorCheckPeriod] = useState(
-    componentInfo?.connectorStoreMessagesProcessorCheckPeriodMillis || '2500'
-  );
-  const [defaultLanguage, setDefaultLanguage] = useState(componentInfo?.connectorDefaultLanguage || 'en');
-
-  const {t} = useTranslation();
-
-  const updateConfig = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    if (isEnabled) {
-      setIsUpdateModalVisible(true);
-    } else {
-      enableSubmitConfigData();
-    }
-  };
-
-  const enableSubmitConfigData = () => {
-    const payload = {
-      projectId,
-      dialogflowCredentials,
-      suggestionConfidenceLevel,
-      replyConfidenceLevel,
-      processorWaitingTime,
-      processorCheckPeriod,
-      defaultLanguage,
-    };
-
-    createNewConnection(payload);
-  };
-
-  return (
-    <ConfigureConnector
-      componentName={ComponentName.enterpriseDialogflowConnector}
-      isUpdateModalVisible={isUpdateModalVisible}
-      setIsUpdateModalVisible={setIsUpdateModalVisible}
-      enableSubmitConfigData={enableSubmitConfigData}
-      isPending={isPending}
-      disabled={
-        !projectId ||
-        !dialogflowCredentials ||
-        !suggestionConfidenceLevel ||
-        !replyConfidenceLevel ||
-        !processorWaitingTime ||
-        !processorCheckPeriod ||
-        !defaultLanguage ||
-        (componentInfo?.projectId === projectId &&
-          componentInfo?.dialogflowCredentials === dialogflowCredentials &&
-          componentInfo?.suggestionConfidenceLevel === suggestionConfidenceLevel &&
-          componentInfo?.replyConfidenceLevel === replyConfidenceLevel &&
-          (componentInfo?.connectorStoreMessagesProcessorMaxWaitMillis || '5000') === processorWaitingTime &&
-          (componentInfo?.connectorStoreMessagesProcessorCheckPeriodMillis || '2500') === processorCheckPeriod &&
-          (componentInfo?.connectorDefaultLanguage || 'en') === defaultLanguage)
-      }
-      isConfigured={isConfigured}
-      updateConfig={updateConfig}
-    >
-      <div className={styles.columnContainer}>
-        <div className={styles.firstColumnForm}>
-          <div className={styles.formRow}>
-            <Input
-              type="text"
-              name="projectID"
-              value={projectId}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => setProjectID(e.target.value)}
-              label={t('projectID')}
-              placeholder={t('AddProjectId')}
-              showLabelIcon
-              tooltipText={t('fromCloudConsole')}
-              required
-              height={32}
-              fontClass="font-base"
-            />
-          </div>
-
-          <div className={styles.formRow}>
-            <Input
-              type="text"
-              name="GoogleApplicationCredentials"
-              value={dialogflowCredentials}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => setDialogflowCredentials(e.target.value)}
-              label={t('GoogleApplicationCredentials')}
-              placeholder={t('AddGoogleApplicationCredentials')}
-              showLabelIcon
-              tooltipText={t('fromCloudConsole')}
-              required
-              height={32}
-              fontClass="font-base"
-            />
-          </div>
-          <div className={styles.formRow}>
-            <Input
-              type="number"
-              step={0.01}
-              min={0.1}
-              max={0.9}
-              name="SuggestionConfidenceLevel"
-              value={suggestionConfidenceLevel}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => setSuggestionConfidenceLevel(e.target.value)}
-              label={t('SuggestionConfidenceLevel')}
-              placeholder={'0.1' + ' ' + t('to') + ' ' + '0.9'}
-              showLabelIcon
-              tooltipText={t('amountSuggestions')}
-              required
-              height={32}
-              fontClass="font-base"
-            />
-          </div>
-          <div className={styles.formRow}>
-            <Input
-              type="number"
-              step={0.01}
-              min={0.1}
-              max={0.9}
-              name="ReplyConfidenceLevel"
-              value={replyConfidenceLevel}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => setReplyConfidenceLevel(e.target.value)}
-              label={t('ReplyConfidenceLevel')}
-              placeholder={'0.1' + ' ' + t('to') + ' ' + '0.9'}
-              showLabelIcon
-              tooltipText={t('amountReplies')}
-              required
-              height={32}
-              fontClass="font-base"
-            />
-          </div>
-        </div>
-        <div className={styles.secondColumnForm}>
-          <div className={styles.formRow}>
-            <Input
-              type="number"
-              name="ProcessorWaitingTime"
-              value={processorWaitingTime}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => setProcessorWaitingTime(e.target.value)}
-              label={t('processorWaitingTime')}
-              placeholder={t('processorWaitingTime')}
-              showLabelIcon
-              tooltipText={t('waitingDefault')}
-              required
-              height={32}
-              fontClass="font-base"
-            />
-          </div>
-          <div className={styles.formRow}>
-            <Input
-              type="number"
-              name="processorCheckPeriod"
-              value={processorCheckPeriod}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => setProcessorCheckPeriod(e.target.value)}
-              label={t('processorCheckPeriod')}
-              placeholder={t('processorCheckPeriod')}
-              showLabelIcon
-              tooltipText={t('checkDefault')}
-              required
-              height={32}
-              fontClass="font-base"
-            />
-          </div>
-          <div className={styles.formRow}>
-            <Input
-              type="text"
-              name="DefaultLanguage"
-              value={defaultLanguage}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => setDefaultLanguage(e.target.value)}
-              label={t('defaultLanguage')}
-              placeholder={t('defaultLanguage')}
-              showLabelIcon
-              tooltipText={t('defaultLanguageTooltip')}
-              required
-              height={32}
-              fontClass="font-base"
-            />
-          </div>
-        </div>
-      </div>
-    </ConfigureConnector>
-  );
-};
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Dialogflow/index.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Dialogflow/index.module.scss
deleted file mode 100644
index a1bf543bd4..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/Dialogflow/index.module.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-@import 'assets/scss/fonts.scss';
-@import 'assets/scss/colors.scss';
-
-.formWrapper {
-  align-self: center;
-}
-
-.settings {
-  width: 29rem;
-}
-
-.columnContainer {
-  display: flex;
-}
-
-.firstColumnForm {
-  display: flex;
-  flex-direction: column;
-  margin-right: 24px;
-}
-
-.secondColumnForm {
-  display: flex;
-  flex-direction: column;
-}
-
-.formRow {
-  width: 464px;
-  height: 80px;
-  margin-bottom: 16px;
-
-  label {
-    @include font-s;
-  }
-
-  &:hover {
-    .actionToolTip {
-      display: block;
-    }
-  }
-}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Facebook/Messenger/FacebookConnect.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Facebook/Messenger/FacebookConnect.module.scss
index 09a67df6f1..c5bc0efc88 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Facebook/Messenger/FacebookConnect.module.scss
+++ b/frontend/control-center/src/pages/Connectors/Providers/Facebook/Messenger/FacebookConnect.module.scss
@@ -50,6 +50,16 @@
   }
 }
 
+.inputContainerModal {
+  @extend .inputContainer;
+  align-items: center;
+  width: 100%;
+
+  label {
+    width: 75%;
+  }
+}
+
 .subtitle {
   display: flex;
   flex-direction: column;
@@ -60,3 +70,25 @@
     height: 13px;
   }
 }
+
+.smartButtonContainer {
+  display: flex;
+  width: 100%;
+  align-items: flex-start;
+  flex-direction: column;
+  span {
+    @include font-base;
+    color: var(--color-red-alert);
+    opacity: 0;
+    transition: all 1s ease;
+  }
+  .errorMessage {
+    opacity: 1;
+    transform: translateY(50%);
+  }
+}
+
+.smartButtonModalContainer {
+  @extend .smartButtonContainer;
+  align-items: center;
+}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Facebook/Messenger/FacebookConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/Facebook/Messenger/FacebookConnect.tsx
index 9aa81f80d3..133b68d03e 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Facebook/Messenger/FacebookConnect.tsx
+++ b/frontend/control-center/src/pages/Connectors/Providers/Facebook/Messenger/FacebookConnect.tsx
@@ -16,8 +16,12 @@ const mapDispatchToProps = {
 
 const connector = connect(null, mapDispatchToProps);
 
-const FacebookConnect = (props: ConnectedProps<typeof connector>) => {
-  const {connectFacebookChannel} = props;
+type FacebookConnectProps = {
+  modal?: boolean;
+} & ConnectedProps<typeof connector>;
+
+const FacebookConnect = (props: FacebookConnectProps) => {
+  const {connectFacebookChannel, modal} = props;
   const channel = useCurrentChannel();
   const navigate = useNavigate();
   const {t} = useTranslation();
@@ -25,12 +29,17 @@ const FacebookConnect = (props: ConnectedProps<typeof connector>) => {
   const [token, setToken] = useState(channel?.metadata?.pageToken || '');
   const [name, setName] = useState(channel?.metadata?.name || '');
   const [image, setImage] = useState(channel?.metadata?.imageUrl || '');
+  const [error, setError] = useState(false);
+  const connectError = t('connectFailed');
   const buttonTitle = channel ? t('updatePage') : t('connectPage') || '';
   const [newButtonTitle, setNewButtonTitle] = useState('');
-  const [errorMessage, setErrorMessage] = useState('');
   const [notification, setNotification] = useState<NotificationModel>(null);
   const [isPending, setIsPending] = useState(false);
 
+  useEffect(() => {
+    modal && setError(false);
+  }, [id, token]);
+
   useEffect(() => {
     if (channel?.sourceChannelId !== id && !!channel) {
       setNotification({show: true, text: t('newChannelInfo'), info: true});
@@ -72,8 +81,8 @@ const FacebookConnect = (props: ConnectedProps<typeof connector>) => {
         navigate(CONNECTORS_ROUTE + '/facebook/connected', {replace: true});
       })
       .catch((error: Error) => {
-        setNotification({show: true, text: t('updateFailed'), successful: false});
-        setErrorMessage(t('errorMessage'));
+        setNotification({show: true, text: channel ? t('updateFailed') : t('connectFailed'), successful: false});
+        modal && setError(true);
         console.error(error);
       })
       .finally(() => {
@@ -83,17 +92,18 @@ const FacebookConnect = (props: ConnectedProps<typeof connector>) => {
 
   return (
     <div className={styles.wrapper}>
-      <div className={styles.inputContainer}>
+      <div className={modal ? styles.inputContainerModal : styles.inputContainer}>
         <Input
           id="id"
           label={t('facebookPageId')}
           placeholder={t('facebookPageIdPlaceholder')}
+          showLabelIcon
+          tooltipText={t('inputTooltipFacebookAppId')}
           value={id}
           onChange={(event: React.ChangeEvent<HTMLInputElement>) => setId(event.target.value)}
           minLength={6}
           required={true}
           height={32}
-          hint={errorMessage}
           fontClass="font-base"
         />
         <Input
@@ -101,26 +111,32 @@ const FacebookConnect = (props: ConnectedProps<typeof connector>) => {
           label={t('token')}
           placeholder={t('tokenPlaceholder')}
           value={token}
+          showLabelIcon
+          tooltipText={t('token')}
           onChange={(event: React.ChangeEvent<HTMLInputElement>) => setToken(event.target.value)}
           required={true}
           height={32}
-          hint={errorMessage}
           fontClass="font-base"
         />
         <Input
           id="name"
-          label={t('nameOptional')}
+          label={t('name')}
           placeholder={t('addAName')}
           hint={t('nameFacebookPlaceholder')}
+          showLabelIcon
+          tooltipText={t('optional')}
           value={name}
           onChange={(event: React.ChangeEvent<HTMLInputElement>) => setName(event.target.value)}
           height={32}
           fontClass="font-base"
         />
         <Input
+          type="url"
           id="image"
-          label={t('imageUrlOptional')}
+          label={t('imageUrl')}
           placeholder={t('addAnUrl')}
+          showLabelIcon
+          tooltipText={t('optional')}
           hint={t('imageFacebookHint')}
           value={image}
           onChange={(event: React.ChangeEvent<HTMLInputElement>) => setImage(event.target.value)}
@@ -128,18 +144,20 @@ const FacebookConnect = (props: ConnectedProps<typeof connector>) => {
           fontClass="font-base"
         />
       </div>
-      <SmartButton
-        title={newButtonTitle !== '' ? newButtonTitle : buttonTitle}
-        height={40}
-        width={160}
-        pending={isPending}
-        className={styles.connectButton}
-        type="submit"
-        styleVariant="normal"
-        disabled={buttonStatus() || isPending}
-        onClick={() => connectNewChannel()}
-      />
-      {notification?.show && (
+      <div className={`${modal ? styles.smartButtonModalContainer : styles.smartButtonContainer}`}>
+        <SmartButton
+          title={modal ? t('create') : newButtonTitle !== '' ? newButtonTitle : buttonTitle}
+          height={40}
+          width={160}
+          pending={isPending}
+          type="submit"
+          styleVariant="normal"
+          disabled={buttonStatus() || isPending}
+          onClick={() => connectNewChannel()}
+        />
+        {modal && <span className={error ? styles.errorMessage : ''}>{connectError}</span>}
+      </div>
+      {notification?.show && !modal && (
         <NotificationComponent
           type={notification.info ? 'sticky' : 'fade'}
           show={notification.show}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Google/GoogleConnect.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Google/GoogleConnect.module.scss
index e5bb21c9aa..f10465b579 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Google/GoogleConnect.module.scss
+++ b/frontend/control-center/src/pages/Connectors/Providers/Google/GoogleConnect.module.scss
@@ -50,6 +50,16 @@
   }
 }
 
+.inputContainerModal {
+  @extend .inputContainer;
+  align-items: center;
+  width: 100%;
+
+  label {
+    width: 75%;
+  }
+}
+
 .subtitle {
   display: flex;
   flex-direction: column;
@@ -60,3 +70,25 @@
     height: 13px;
   }
 }
+
+.smartButtonContainer {
+  display: flex;
+  width: 100%;
+  align-items: flex-start;
+  flex-direction: column;
+  span {
+    @include font-base;
+    color: var(--color-red-alert);
+    opacity: 0;
+    transition: all 1s ease;
+  }
+  .errorMessage {
+    opacity: 1;
+    transform: translateY(50%);
+  }
+}
+
+.smartButtonModalContainer {
+  @extend .smartButtonContainer;
+  align-items: center;
+}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Google/GoogleConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/Google/GoogleConnect.tsx
index 18cdcbd21e..6ef9b4874e 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Google/GoogleConnect.tsx
+++ b/frontend/control-center/src/pages/Connectors/Providers/Google/GoogleConnect.tsx
@@ -20,20 +20,29 @@ const mapDispatchToProps = {
 
 const connector = connect(null, mapDispatchToProps);
 
-const GoogleConnect = (props: ConnectedProps<typeof connector>) => {
-  const {connectGoogleChannel} = props;
+type GoogleConnectProps = {
+  modal?: boolean;
+} & ConnectedProps<typeof connector>;
+
+const GoogleConnect = (props: GoogleConnectProps) => {
+  const {connectGoogleChannel, modal} = props;
   const channel = useCurrentChannel();
   const navigate = useNavigate();
   const {t} = useTranslation();
   const [id, setId] = useState(channel?.sourceChannelId || '');
   const [name, setName] = useState(channel?.metadata?.name || '');
   const [image, setImage] = useState(channel?.metadata?.imageUrl || '');
+  const [error, setError] = useState(false);
+  const connectError = t('connectFailed');
   const buttonTitle = channel ? t('updatePage') : t('connectPage') || '';
-  const [errorMessage, setErrorMessage] = useState('');
   const [notification, setNotification] = useState<NotificationModel>(null);
   const [isPending, setIsPending] = useState(false);
   const [newButtonTitle, setNewButtonTitle] = useState('');
 
+  useEffect(() => {
+    modal && setError(false);
+  }, [id, name]);
+
   const buttonStatus = () => {
     return (
       !(id.length > 5 && name.length > 0) ||
@@ -76,11 +85,11 @@ const GoogleConnect = (props: ConnectedProps<typeof connector>) => {
       .catch((error: Error) => {
         setNotification({
           show: true,
-          text: buttonTitle === t('connectPage') ? t('createFailed') : 'updateFailed',
+          text: buttonTitle === t('connectPage') ? t('connectFailed') : 'updateFailed',
           successful: false,
           info: false,
         });
-        setErrorMessage(t('errorMessage'));
+        modal && setError(true);
         console.error(error);
       })
       .finally(() => {
@@ -90,23 +99,26 @@ const GoogleConnect = (props: ConnectedProps<typeof connector>) => {
 
   return (
     <div className={styles.wrapper}>
-      <div className={styles.inputContainer}>
+      <div className={modal ? styles.inputContainerModal : styles.inputContainer}>
         <Input
           id="id"
           label={t('agentId')}
           placeholder={t('googleAgentPlaceholder')}
+          showLabelIcon
+          tooltipText={t('addAgentId')}
           value={id}
           onChange={(event: React.ChangeEvent<HTMLInputElement>) => setId(event.target.value)}
           minLength={6}
           required={true}
           height={32}
-          hint={errorMessage}
           fontClass="font-base"
         />
         <Input
           id="name"
           label={t('name')}
           placeholder={t('addAName')}
+          showLabelIcon
+          tooltipText={t('addName')}
           value={name}
           onChange={(event: React.ChangeEvent<HTMLInputElement>) => setName(event.target.value)}
           required={true}
@@ -115,27 +127,32 @@ const GoogleConnect = (props: ConnectedProps<typeof connector>) => {
           fontClass="font-base"
         />
         <Input
+          type="url"
           id="image"
-          label={t('imageUrlOptional')}
+          label={t('imageUrl')}
           placeholder={t('addAnUrl')}
+          showLabelIcon
+          tooltipText={t('optional')}
           value={image}
           onChange={(event: React.ChangeEvent<HTMLInputElement>) => setImage(event.target.value)}
           height={32}
           fontClass="font-base"
         />
       </div>
-      <SmartButton
-        title={newButtonTitle !== '' ? newButtonTitle : buttonTitle}
-        height={40}
-        width={160}
-        pending={isPending}
-        className={styles.connectButton}
-        type="submit"
-        styleVariant="normal"
-        disabled={buttonStatus() || isPending}
-        onClick={() => connectNewChannel()}
-      />
-      {notification?.show && (
+      <div className={`${modal ? styles.smartButtonModalContainer : styles.smartButtonContainer}`}>
+        <SmartButton
+          title={modal ? t('create') : newButtonTitle !== '' ? newButtonTitle : buttonTitle}
+          height={40}
+          width={160}
+          pending={isPending}
+          type="submit"
+          styleVariant="normal"
+          disabled={buttonStatus() || isPending}
+          onClick={() => connectNewChannel()}
+        />
+        {modal && <span className={error ? styles.errorMessage : ''}>{connectError}</span>}
+      </div>
+      {notification?.show && !modal && (
         <NotificationComponent
           type={notification.info ? 'sticky' : 'fade'}
           show={notification.show}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Instagram/InstagramConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/Instagram/InstagramConnect.tsx
index 2d2dd4a83e..1e453d2826 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Instagram/InstagramConnect.tsx
+++ b/frontend/control-center/src/pages/Connectors/Providers/Instagram/InstagramConnect.tsx
@@ -125,6 +125,7 @@ const InstagramConnect = (props: ConnectedProps<typeof connector>) => {
           fontClass="font-base"
         />
         <Input
+          type="url"
           id="image"
           label={t('imageUrlOptional')}
           placeholder={t('addAnUrl')}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Rasa/RasaConnect.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Rasa/RasaConnect.module.scss
deleted file mode 100644
index 1fdbd99211..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/Rasa/RasaConnect.module.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@import 'assets/scss/fonts.scss';
-@import 'assets/scss/colors.scss';
-
-.formWrapper {
-  align-self: center;
-}
-
-.settings {
-  width: 29rem;
-}
-
-.formRow {
-  height: 80px;
-  margin-bottom: 16px;
-
-  label {
-    @include font-s;
-  }
-
-  &:hover {
-    .actionToolTip {
-      display: block;
-    }
-  }
-}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Rasa/RasaConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/Rasa/RasaConnect.tsx
deleted file mode 100644
index 4ce49a72ec..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/Rasa/RasaConnect.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React, {useState} from 'react';
-import {useSelector} from 'react-redux';
-import {StateModel} from '../../../../reducers';
-import {Input} from 'components';
-import {ConfigureConnector} from '../../ConfigureConnector';
-import {useTranslation} from 'react-i18next';
-import styles from './RasaConnect.module.scss';
-import {ComponentName} from 'model';
-
-interface ConnectParams {
-  [key: string]: string;
-}
-
-type RasaConnectProps = {
-  createNewConnection: (configValues: ConnectParams) => void;
-  isEnabled: boolean;
-  isConfigured: boolean;
-  isPending: boolean;
-};
-
-export const RasaConnect = ({createNewConnection, isEnabled, isConfigured, isPending}: RasaConnectProps) => {
-  const componentInfo = useSelector((state: StateModel) => state.data.connector[ComponentName.rasaConnector]);
-  const [webhookUrl, setWebhookUrl] = useState(componentInfo?.webhookUrl || '');
-  const [apiHost, setApiHost] = useState(componentInfo?.apiHost || '');
-  const [token, setToken] = useState(componentInfo?.token || '');
-  const [isUpdateModalVisible, setIsUpdateModalVisible] = useState(false);
-  const {t} = useTranslation();
-  const isUrlValid = webhookUrl && (webhookUrl.startsWith('https') || webhookUrl.startsWith('http'));
-
-  const updateConfig = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    if (isEnabled) {
-      setIsUpdateModalVisible(true);
-    } else {
-      enableSubmitConfigData();
-    }
-  };
-
-  const enableSubmitConfigData = () => {
-    createNewConnection({webhookUrl, apiHost, token});
-  };
-
-  return (
-    <ConfigureConnector
-      componentName={ComponentName.rasaConnector}
-      isUpdateModalVisible={isUpdateModalVisible}
-      setIsUpdateModalVisible={setIsUpdateModalVisible}
-      enableSubmitConfigData={enableSubmitConfigData}
-      disabled={!isUrlValid || componentInfo?.webhookUrl === webhookUrl}
-      isConfigured={isConfigured}
-      updateConfig={updateConfig}
-      isPending={isPending}
-    >
-      <div className={styles.formRow}>
-        <Input
-          type="url"
-          name="webhook"
-          value={webhookUrl}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setWebhookUrl(e.target.value)}
-          label="Rasa Webhook"
-          placeholder={t('rasaWebhookPlaceholder')}
-          showLabelIcon
-          tooltipText={t('rasaWebhookTooltip')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="apiHost"
-          value={apiHost}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setApiHost(e.target.value)}
-          label="Api Host"
-          placeholder={t('rasaApihostPlaceholder')}
-          showLabelIcon
-          tooltipText={t('rasaApihostTooltip')}
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="token"
-          value={token}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setToken(e.target.value)}
-          label="Token"
-          placeholder={t('rasaTokenPlaceholder')}
-          showLabelIcon
-          tooltipText={t('rasaTokenTooltip')}
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-    </ConfigureConnector>
-  );
-};
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Salesforce/ConnectNewSalesforce.tsx b/frontend/control-center/src/pages/Connectors/Providers/Salesforce/ConnectNewSalesforce.tsx
deleted file mode 100644
index dff23e9562..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/Salesforce/ConnectNewSalesforce.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import React, {useState} from 'react';
-import {useSelector} from 'react-redux';
-import {StateModel} from '../../../../reducers';
-import {Input} from 'components';
-import {ConfigureConnector} from '../../ConfigureConnector';
-import {useTranslation} from 'react-i18next';
-import styles from './index.module.scss';
-import {ComponentName} from 'model';
-
-interface ConnectParams {
-  [key: string]: string;
-}
-
-type ConnectNewSalesforceProps = {
-  createNewConnection: (configValues: ConnectParams) => void;
-  isEnabled: boolean;
-  isConfigured: boolean;
-  isPending: boolean;
-};
-
-export const ConnectNewSalesforce = ({
-  createNewConnection,
-  isEnabled,
-  isConfigured,
-  isPending,
-}: ConnectNewSalesforceProps) => {
-  const componentInfo = useSelector(
-    (state: StateModel) => state.data.connector[ComponentName.enterpriseSalesforceContactsIngestion]
-  );
-  const [url, setUrl] = useState(componentInfo?.url || '');
-  const [username, setUsername] = useState(componentInfo?.username || '');
-  const [password, setPassword] = useState(componentInfo?.password || '');
-  const [securityToken, setSecurityToken] = useState(componentInfo?.securityToken || '');
-  const [isUpdateModalVisible, setIsUpdateModalVisible] = useState(false);
-  const {t} = useTranslation();
-  const isUrlValid = url && (url.startsWith('https') || url.startsWith('http'));
-
-  const updateConfig = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    if (isEnabled) {
-      setIsUpdateModalVisible(true);
-    } else {
-      enableSubmitConfigData();
-    }
-  };
-
-  const enableSubmitConfigData = () => {
-    createNewConnection({url, username, password, securityToken});
-  };
-
-  return (
-    <ConfigureConnector
-      componentName={ComponentName.enterpriseSalesforceContactsIngestion}
-      isUpdateModalVisible={isUpdateModalVisible}
-      setIsUpdateModalVisible={setIsUpdateModalVisible}
-      enableSubmitConfigData={enableSubmitConfigData}
-      disabled={
-        !isUrlValid ||
-        !username ||
-        !password ||
-        !securityToken ||
-        (componentInfo?.url === url &&
-          componentInfo?.username === username &&
-          componentInfo?.password === password &&
-          componentInfo?.securityToken === securityToken)
-      }
-      isConfigured={isConfigured}
-      updateConfig={updateConfig}
-      isPending={isPending}
-    >
-      <div className={styles.formRow}>
-        <Input
-          type="url"
-          name="url"
-          value={url}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setUrl(e.target.value)}
-          label={t('salesforceOrgUrl')}
-          placeholder={t('yourSalesforceOrgUrl')}
-          showLabelIcon
-          tooltipText={t('salesforceOrgUrlExample')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="username"
-          value={username}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setUsername(e.target.value)}
-          label={t('Username')}
-          placeholder={t('yourSalesforceUsername')}
-          showLabelIcon
-          tooltipText={t('yourSalesforceUsername')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="password"
-          value={password}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setPassword(e.target.value)}
-          label={t('Password')}
-          placeholder={t('yourSalesforcePassword')}
-          showLabelIcon
-          tooltipText={t('yourSalesforcePassword')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="securityToken"
-          value={securityToken}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setSecurityToken(e.target.value)}
-          label={t('securityToken')}
-          placeholder={t('yourSalesforceSecurityToken')}
-          showLabelIcon
-          tooltipText={t('yourSalesforceSecurityToken')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-    </ConfigureConnector>
-  );
-};
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Salesforce/index.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Salesforce/index.module.scss
deleted file mode 100644
index 1fdbd99211..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/Salesforce/index.module.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@import 'assets/scss/fonts.scss';
-@import 'assets/scss/colors.scss';
-
-.formWrapper {
-  align-self: center;
-}
-
-.settings {
-  width: 29rem;
-}
-
-.formRow {
-  height: 80px;
-  margin-bottom: 16px;
-
-  label {
-    @include font-s;
-  }
-
-  &:hover {
-    .actionToolTip {
-      display: block;
-    }
-  }
-}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Twilio/TwilioConnect.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Twilio/TwilioConnect.module.scss
index 965befba5e..3a3a1269ec 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Twilio/TwilioConnect.module.scss
+++ b/frontend/control-center/src/pages/Connectors/Providers/Twilio/TwilioConnect.module.scss
@@ -1,19 +1,23 @@
 @import 'assets/scss/fonts.scss';
 @import 'assets/scss/colors.scss';
 
-.formContainer {
-  margin-top: 24px;
-}
-
 .formContent {
-  display: block;
+  display: flex;
   flex-direction: column;
+  width: 100%;
+  align-items: flex-start;
+  justify-content: center;
 }
 
-.formContentNumber {
-  height: 62px;
-  width: 474px;
-  margin: 24px 0px 58px 0px;
+.formContentModal {
+  @extend .formContent;
+  align-items: center;
+}
+
+.formRow {
+  height: 82px;
+  width: 75%;
+  max-width: 20rem;
 }
 
 .formImageCard {
@@ -65,12 +69,6 @@
   color: var(--color-text-gray);
 }
 
-.formContentName {
-  height: 62px;
-  width: 474px;
-  margin: 24px 0px 58px 0px;
-}
-
 .inputField {
   @include font-base;
   background-color: transparent;
@@ -81,14 +79,6 @@
   margin: 5px 0px 5px 0px;
 }
 
-.wrapper {
-  background: var(--color-background-white);
-  display: block;
-  border-radius: 10px;
-  width: 100%;
-  min-height: calc(100vh - 170px);
-}
-
 .headline {
   @include font-xl;
   color: var(--color-text-contrast);
@@ -113,3 +103,25 @@
   }
   margin-right: 8px;
 }
+
+.smartButtonContainer {
+  display: flex;
+  width: 100%;
+  align-items: flex-start;
+  flex-direction: column;
+  span {
+    @include font-base;
+    color: var(--color-red-alert);
+    opacity: 0;
+    transition: all 1s ease;
+  }
+  .errorMessage {
+    opacity: 1;
+    transform: translateY(50%);
+  }
+}
+
+.smartButtonModalContainer {
+  @extend .smartButtonContainer;
+  align-items: center;
+}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Twilio/TwilioConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/Twilio/TwilioConnect.tsx
index 4c4048d799..e859e96377 100644
--- a/frontend/control-center/src/pages/Connectors/Providers/Twilio/TwilioConnect.tsx
+++ b/frontend/control-center/src/pages/Connectors/Providers/Twilio/TwilioConnect.tsx
@@ -9,15 +9,16 @@ import {Channel, NotificationModel, Source} from 'model';
 import styles from './TwilioConnect.module.scss';
 
 import {CONNECTORS_ROUTE} from '../../../../routes/routes';
-import {useNavigate} from 'react-router-dom';
+import {useNavigate, useParams} from 'react-router-dom';
 import {useTranslation} from 'react-i18next';
 
 type TwilioConnectProps = {
   channel?: Channel;
-  source: string;
-  pageTitle: string;
-  buttonText: string;
-  infoLink: string;
+  source?: string;
+  pageTitle?: string;
+  buttonText?: string;
+  infoLink?: string;
+  modal?: boolean;
 } & ConnectedProps<typeof connector>;
 
 const mapDispatchToProps = {connectTwilioWhatsapp, connectTwilioSms};
@@ -25,17 +26,24 @@ const mapDispatchToProps = {connectTwilioWhatsapp, connectTwilioSms};
 const connector = connect(null, mapDispatchToProps);
 
 const TwilioConnect = (props: TwilioConnectProps) => {
-  const {channel, source, buttonText, connectTwilioWhatsapp, connectTwilioSms} = props;
+  const {channel, buttonText, connectTwilioWhatsapp, connectTwilioSms, modal} = props;
   const {t} = useTranslation();
-
+  const params = useParams();
+  const {source} = params;
   const navigate = useNavigate();
   const [numberInput, setNumberInput] = useState(channel?.sourceChannelId || '');
   const [nameInput, setNameInput] = useState(channel?.metadata?.name || '');
   const [imageUrlInput, setImageUrlInput] = useState(channel?.metadata?.imageUrl || '');
+  const [error, setError] = useState(false);
+  const connectError = t('connectFailed');
   const [notification, setNotification] = useState<NotificationModel>(null);
   const [newButtonText, setNewButtonText] = useState('');
   const [isPending, setIsPending] = useState(false);
 
+  useEffect(() => {
+    modal && setError(false);
+  }, [numberInput]);
+
   useEffect(() => {
     if (channel?.sourceChannelId !== numberInput && !!channel) {
       setNotification({show: true, text: t('newChannelInfo'), info: true});
@@ -76,7 +84,7 @@ const TwilioConnect = (props: TwilioConnectProps) => {
       imageUrl: imageUrlInput,
     };
 
-    if (source === Source.twilioWhatsApp) {
+    if (source === Source.twilioWhatsApp || props.source === Source.twilioWhatsApp) {
       connectTwilioWhatsapp(connectPayload)
         .then(() => {
           navigate(CONNECTORS_ROUTE + `/twilio.whatsapp/connected`, {
@@ -91,13 +99,14 @@ const TwilioConnect = (props: TwilioConnectProps) => {
             successful: false,
             info: false,
           });
+          modal && setError(true);
           console.error(error);
         })
         .finally(() => {
           setIsPending(false);
         });
     }
-    if (source === Source.twilioSMS) {
+    if (source === Source.twilioSMS || props.source === Source.twilioSMS) {
       connectTwilioSms(connectPayload)
         .then(() => {
           navigate(CONNECTORS_ROUTE + `/twilio.sms/connected`, {replace: true, state: {source: 'twilio.sms'}});
@@ -109,6 +118,7 @@ const TwilioConnect = (props: TwilioConnectProps) => {
             successful: false,
             info: false,
           });
+          modal && setError(true);
           console.error(error);
         })
         .finally(() => {
@@ -118,66 +128,65 @@ const TwilioConnect = (props: TwilioConnectProps) => {
   };
 
   return (
-    <div className={styles.wrapper}>
-      <form className={styles.formContainer}>
-        <div className={styles.formContent}>
-          <div className={styles.formContentNumber}>
-            <Input
-              label={t('twilioPhoneNumber')}
-              placeholder={t('twilioPhoneNumberPlaceholder')}
-              value={numberInput}
-              required={true}
-              height={32}
-              autoFocus={true}
-              onChange={handleNumberInput}
-              fontClass="font-base"
-            />
-          </div>
-          <div className={styles.formContentName}>
-            <Input
-              label={t('nameOptional')}
-              placeholder={t('addAName')}
-              value={nameInput}
-              required={false}
-              height={32}
-              onChange={handleNameInput}
-              fontClass="font-base"
-            />
-          </div>
-          <div className={styles.formContentNumber}>
-            <UrlInputField
-              label={t('imageUrlOptional')}
-              placeholder={t('addAnUrl')}
-              value={imageUrlInput}
-              required={false}
-              height={32}
-              onChange={handleImageUrlInput}
-              fontClass="font-base"
-            />
-          </div>
-          <SmartButton
-            title={newButtonText !== '' ? newButtonText : buttonText}
-            height={40}
-            width={160}
-            pending={isPending}
-            className={styles.connectButton}
-            type="submit"
-            styleVariant="normal"
-            disabled={buttonStatus() || isPending}
-            onClick={(e: React.ChangeEvent<HTMLFormElement>) => connectTwilioChannel(e)}
-          />
-        </div>
-        {notification?.show && (
-          <NotificationComponent
-            type={notification.info ? 'sticky' : 'fade'}
-            show={notification.show}
-            text={notification.text}
-            info={notification.info}
-            setShowFalse={setNotification}
-          />
-        )}
-      </form>
-    </div>
+    <form className={modal ? styles.formContentModal : styles.formContent}>
+      <div className={styles.formRow}>
+        <Input
+          label={t('twilioPhoneNumber')}
+          placeholder={t('twilioPhoneNumberPlaceholder')}
+          value={numberInput}
+          required={true}
+          height={32}
+          autoFocus={true}
+          onChange={handleNumberInput}
+          fontClass="font-base"
+        />
+      </div>
+      <div className={styles.formRow}>
+        <Input
+          label={t('nameOptional')}
+          placeholder={t('addAName')}
+          value={nameInput}
+          required={false}
+          height={32}
+          onChange={handleNameInput}
+          fontClass="font-base"
+        />
+      </div>
+      <div className={styles.formRow}>
+        <UrlInputField
+          label={t('imageUrlOptional')}
+          placeholder={t('addAnUrl')}
+          value={imageUrlInput}
+          required={false}
+          height={32}
+          onChange={handleImageUrlInput}
+          fontClass="font-base"
+        />
+      </div>
+      <div className={`${modal ? styles.smartButtonModalContainer : styles.smartButtonContainer}`}>
+        <SmartButton
+          title={modal ? t('create') : newButtonText !== '' ? newButtonText : buttonText}
+          height={40}
+          width={160}
+          pending={isPending}
+          className={styles.connectButton}
+          type="submit"
+          styleVariant="normal"
+          disabled={buttonStatus() || isPending}
+          onClick={(e: React.ChangeEvent<HTMLFormElement>) => connectTwilioChannel(e)}
+        />
+        {modal && <span className={error ? styles.errorMessage : ''}>{connectError}</span>}
+      </div>
+      {notification?.show && !modal && (
+        <NotificationComponent
+          type={notification.info ? 'sticky' : 'fade'}
+          show={notification.show}
+          text={notification.text}
+          info={notification.info}
+          setShowFalse={setNotification}
+        />
+      )}
+    </form>
   );
 };
 
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Viber/ViberConnect.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Viber/ViberConnect.module.scss
new file mode 100644
index 0000000000..c5bc0efc88
--- /dev/null
+++ b/frontend/control-center/src/pages/Connectors/Providers/Viber/ViberConnect.module.scss
@@ -0,0 +1,94 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.wrapper {
+  background: var(--color-background-white);
+  display: block;
+  border-radius: 10px;
+  width: 100%;
+  height: 100%;
+}
+
+.headline {
+  @include font-xl;
+  font-weight: bold;
+  color: var(--color-text-contrast);
+  margin-bottom: 8px;
+}
+
+.backButton {
+  display: block;
+  margin-bottom: 16px;
+  cursor: pointer;
+  text-decoration: none;
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.backIcon {
+  height: 13px;
+  width: 17px;
+  path {
+    fill: var(--color-airy-blue);
+  }
+  margin-right: 8px;
+}
+
+.inputContainer {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 32px;
+  width: 474px;
+
+  label {
+    height: 82px;
+  }
+
+  input {
+    @include font-base;
+  }
+}
+
+.inputContainerModal {
+  @extend .inputContainer;
+  align-items: center;
+  width: 100%;
+
+  label {
+    width: 75%;
+  }
+}
+
+.subtitle {
+  display: flex;
+  flex-direction: column;
+  @include font-s;
+  color: var(--color-airy-blue);
+  img {
+    width: 17px;
+    height: 13px;
+  }
+}
+
+.smartButtonContainer {
+  display: flex;
+  width: 100%;
+  align-items: flex-start;
+  flex-direction: column;
+  span {
+    @include font-base;
+    color: var(--color-red-alert);
+    opacity: 0;
+    transition: all 1s ease;
+  }
+  .errorMessage {
+    opacity: 1;
+    transform: translateY(50%);
+  }
+}
+
+.smartButtonModalContainer {
+  @extend .smartButtonContainer;
+  align-items: center;
+}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Viber/ViberConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/Viber/ViberConnect.tsx
new file mode 100644
index 0000000000..ae37ac8879
--- /dev/null
+++ b/frontend/control-center/src/pages/Connectors/Providers/Viber/ViberConnect.tsx
@@ -0,0 +1,129 @@
+import React, {useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {connect, ConnectedProps} from 'react-redux';
+import {connectViberChannel} from '../../../../actions/channel';
+import {Input, NotificationComponent, SmartButton} from 'components';
+import {ConnectViberRequestPayload} from 'httpclient/src';
+import styles from './ViberConnect.module.scss';
+import {useCurrentChannel} from '../../../../selectors/channels';
+import {NotificationModel} from 'model';
+import {useNavigate} from 'react-router-dom';
+import {CONNECTORS_ROUTE} from '../../../../routes/routes';
+
+const mapDispatchToProps = {
+  connectViberChannel,
+};
+
+const connector = connect(null, mapDispatchToProps);
+
+type ViberConnectProps = {
+  modal?: boolean;
+} & ConnectedProps<typeof connector>;
+
+const ViberConnect = (props: ViberConnectProps) => {
+  const {connectViberChannel, modal} = props;
+  const channel = useCurrentChannel();
+  const navigate = useNavigate();
+  const {t} = useTranslation();
+  const [name, setName] = useState(channel?.metadata?.name || '');
+  const [image, setImage] = useState(channel?.metadata?.imageUrl || '');
+  const [error, setError] = useState(false);
+  const connectError = t('connectFailed');
+  const buttonTitle = channel ? t('updatePage') : t('connectPage') || '';
+  const [notification, setNotification] = useState<NotificationModel>(null);
+  const [isPending, setIsPending] = useState(false);
+
+  useEffect(() => {
+    modal && setError(false);
+  }, [name, image]);
+
+  const buttonStatus = () => {
+    return (
+      (channel?.metadata?.name === name && channel?.metadata?.imageUrl === image) ||
+      (!!channel?.metadata?.imageUrl && image === '')
+    );
+  };
+
+  const connectNewChannel = () => {
+    const connectPayload: ConnectViberRequestPayload = {
+      ...(name &&
+        name !== '' && {
+          name,
+        }),
+      ...(image &&
+        image !== '' && {
+          imageUrl: image,
+        }),
+    };
+
+    setIsPending(true);
+
+    connectViberChannel(connectPayload)
+      .then(() => {
+        navigate(CONNECTORS_ROUTE + '/viber/connected', {replace: true});
+      })
+      .catch((error: Error) => {
+        setNotification({show: true, text: t('updateFailed'), successful: false});
+        modal && setError(true);
+        console.error(error);
+      })
+      .finally(() => {
+        setIsPending(false);
+      });
+  };
+
+  return (
+    <div className={styles.wrapper}>
+      <div className={modal ? styles.inputContainerModal : styles.inputContainer}>
+        <Input
+          id="name"
+          label={t('name')}
+          placeholder={t('addAName')}
+          showLabelIcon
+          tooltipText={t('optional')}
+          value={name}
+          onChange={(event: React.ChangeEvent<HTMLInputElement>) => setName(event.target.value)}
+          height={32}
+          fontClass="font-base"
+        />
+        <Input
+          type="url"
+          id="image"
+          label={t('imageUrl')}
+          placeholder={t('addAnUrl')}
+          showLabelIcon
+          tooltipText={t('optional')}
+          value={image}
+          onChange={(event: React.ChangeEvent<HTMLInputElement>) => setImage(event.target.value)}
+          height={32}
+          fontClass="font-base"
+        />
+      </div>
+      <div className={`${modal ? styles.smartButtonModalContainer : styles.smartButtonContainer}`}>
+        <SmartButton
+          title={modal ? t('create') : buttonTitle}
+          height={40}
+          width={160}
+          pending={isPending}
+          type="submit"
+          styleVariant="normal"
+          disabled={buttonStatus() || isPending}
+          onClick={() => connectNewChannel()}
+        />
+        {modal && <span className={error ? styles.errorMessage : ''}>{connectError}</span>}
+      </div>
+      {notification?.show && !modal && (
+        <NotificationComponent
+          type={notification.info ? 'sticky' : 'fade'}
+          show={notification.show}
+          text={notification.text}
+          successful={notification.successful}
+          info={notification.info}
+          setShowFalse={setNotification}
+        />
+      )}
+    </div>
+  );
+};
+
+export default connector(ViberConnect);
diff --git a/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappBusinessCloudConnect.module.scss b/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappBusinessCloudConnect.module.scss
deleted file mode 100644
index 1fdbd99211..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappBusinessCloudConnect.module.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@import 'assets/scss/fonts.scss';
-@import 'assets/scss/colors.scss';
-
-.formWrapper {
-  align-self: center;
-}
-
-.settings {
-  width: 29rem;
-}
-
-.formRow {
-  height: 80px;
-  margin-bottom: 16px;
-
-  label {
-    @include font-s;
-  }
-
-  &:hover {
-    .actionToolTip {
-      display: block;
-    }
-  }
-}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappBusinessCloudConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappBusinessCloudConnect.tsx
deleted file mode 100644
index 2d47983380..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappBusinessCloudConnect.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import React, {useState} from 'react';
-import {useSelector} from 'react-redux';
-import {StateModel} from '../../../../reducers';
-import {Input} from 'components';
-import {ConfigureConnector} from '../../ConfigureConnector';
-import {useTranslation} from 'react-i18next';
-import styles from './WhatsappBusinessCloudConnect.module.scss';
-import {ComponentName, ConnectorName} from 'model';
-
-interface ConnectParams {
-  [key: string]: string;
-}
-
-type WhatsappBusinessCloudConnectProps = {
-  createNewConnection: (configValues: ConnectParams) => void;
-  isEnabled: boolean;
-  isConfigured: boolean;
-  isPending: boolean;
-};
-
-export const WhatsappBusinessCloudConnect = ({
-  createNewConnection,
-  isEnabled,
-  isConfigured,
-  isPending,
-}: WhatsappBusinessCloudConnectProps) => {
-  const componentInfo = useSelector(
-    (state: StateModel) => state.data.connector[ConnectorName.sourcesWhatsappBusinessCloud]
-  );
-  const [appId, setAppId] = useState(componentInfo?.appId || '');
-  const [appSecret, setAppSecret] = useState(componentInfo?.appSecret || '');
-  const [phoneNumber, setPhoneNumber] = useState(componentInfo?.phoneNumber || '');
-  const [name, setName] = useState(componentInfo?.name || '');
-  const [avatarUrl, setAvatarUrl] = useState(componentInfo?.avatarUrl || '');
-  const [isUpdateModalVisible, setIsUpdateModalVisible] = useState(false);
-  const {t} = useTranslation();
-
-  const updateConfig = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    if (isEnabled) {
-      setIsUpdateModalVisible(true);
-    } else {
-      enableSubmitConfigData();
-    }
-  };
-
-  const enableSubmitConfigData = () => {
-    createNewConnection({appId, appSecret, phoneNumber, name, avatarUrl});
-  };
-
-  return (
-    <ConfigureConnector
-      componentName={ComponentName.sourcesWhatsappBusinessCloud}
-      isUpdateModalVisible={isUpdateModalVisible}
-      setIsUpdateModalVisible={setIsUpdateModalVisible}
-      enableSubmitConfigData={enableSubmitConfigData}
-      disabled={appId === '' || appSecret === '' || phoneNumber === ''}
-      isConfigured={isConfigured}
-      updateConfig={updateConfig}
-      isPending={isPending}
-    >
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="appId"
-          value={appId}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setAppId(e.target.value)}
-          label="App ID"
-          placeholder={t('whatsappBusinessCloudAppIdPlaceholder')}
-          showLabelIcon
-          tooltipText={t('whatsappBusinessCloudAppIdTooltip')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="appSecret"
-          value={appSecret}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setAppSecret(e.target.value)}
-          label="App Secret"
-          placeholder={t('whatsappBusinessCloudAppSecretPlaceholder')}
-          showLabelIcon
-          tooltipText={t('whatsappBusinessCloudAppSecretToolTip')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="phoneNumber"
-          value={phoneNumber}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setPhoneNumber(e.target.value)}
-          label="Phone Number"
-          placeholder={t('whatsappBusinessCloudPhoneNumberPlaceholder')}
-          showLabelIcon
-          tooltipText={t('whatsappBusinessCloudPhoneNumberTooltip')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="name"
-          value={name}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setName(e.target.value)}
-          label="Name"
-          placeholder={t('name')}
-          showLabelIcon
-          tooltipText={t('optional')}
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="avatarUrl"
-          value={avatarUrl}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setAvatarUrl(e.target.value)}
-          label="Avatar Url"
-          placeholder="Avatar Url"
-          showLabelIcon
-          tooltipText={t('optional')}
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-    </ConfigureConnector>
-  );
-};
diff --git a/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappConnect.module.scss b/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappConnect.module.scss
new file mode 100644
index 0000000000..c5bc0efc88
--- /dev/null
+++ b/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappConnect.module.scss
@@ -0,0 +1,94 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.wrapper {
+  background: var(--color-background-white);
+  display: block;
+  border-radius: 10px;
+  width: 100%;
+  height: 100%;
+}
+
+.headline {
+  @include font-xl;
+  font-weight: bold;
+  color: var(--color-text-contrast);
+  margin-bottom: 8px;
+}
+
+.backButton {
+  display: block;
+  margin-bottom: 16px;
+  cursor: pointer;
+  text-decoration: none;
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.backIcon {
+  height: 13px;
+  width: 17px;
+  path {
+    fill: var(--color-airy-blue);
+  }
+  margin-right: 8px;
+}
+
+.inputContainer {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 32px;
+  width: 474px;
+
+  label {
+    height: 82px;
+  }
+
+  input {
+    @include font-base;
+  }
+}
+
+.inputContainerModal {
+  @extend .inputContainer;
+  align-items: center;
+  width: 100%;
+
+  label {
+    width: 75%;
+  }
+}
+
+.subtitle {
+  display: flex;
+  flex-direction: column;
+  @include font-s;
+  color: var(--color-airy-blue);
+  img {
+    width: 17px;
+    height: 13px;
+  }
+}
+
+.smartButtonContainer {
+  display: flex;
+  width: 100%;
+  align-items: flex-start;
+  flex-direction: column;
+  span {
+    @include font-base;
+    color: var(--color-red-alert);
+    opacity: 0;
+    transition: all 1s ease;
+  }
+  .errorMessage {
+    opacity: 1;
+    transform: translateY(50%);
+  }
+}
+
+.smartButtonModalContainer {
+  @extend .smartButtonContainer;
+  align-items: center;
+}
diff --git a/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappConnect.tsx b/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappConnect.tsx
new file mode 100644
index 0000000000..017d57c287
--- /dev/null
+++ b/frontend/control-center/src/pages/Connectors/Providers/WhatsappBusinessCloud/WhatsappConnect.tsx
@@ -0,0 +1,170 @@
+import React, {useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {connect, ConnectedProps} from 'react-redux';
+import {connectWhatsappChannel} from '../../../../actions/channel';
+import {Input, NotificationComponent, SmartButton} from 'components';
+import {ConnectWhatsappRequestPayload} from 'httpclient/src';
+import styles from './WhatsappConnect.module.scss';
+import {useCurrentChannel} from '../../../../selectors/channels';
+import {NotificationModel} from 'model';
+import {useNavigate} from 'react-router-dom';
+import {CONNECTORS_ROUTE} from '../../../../routes/routes';
+
+const mapDispatchToProps = {
+  connectWhatsappChannel,
+};
+
+const connector = connect(null, mapDispatchToProps);
+
+type WhatsappConnectProps = {
+  modal?: boolean;
+} & ConnectedProps<typeof connector>;
+
+const WhatsappConnect = (props: WhatsappConnectProps) => {
+  const {connectWhatsappChannel, modal} = props;
+  const channel = useCurrentChannel();
+  const navigate = useNavigate();
+  const {t} = useTranslation();
+  const [phoneNumberId, setPhoneNumberId] = useState(channel?.sourceChannelId || '');
+  const [userToken, setUserToken] = useState(channel?.metadata?.userToken || '');
+  const [name, setName] = useState(channel?.metadata?.name || '');
+  const [image, setImage] = useState(channel?.metadata?.imageUrl || '');
+  const [error, setError] = useState(false);
+  const connectError = t('connectFailed');
+  const buttonTitle = channel ? t('updatePage') : t('connectPage') || '';
+  const [newButtonTitle, setNewButtonTitle] = useState('');
+  const [notification, setNotification] = useState<NotificationModel>(null);
+  const [isPending, setIsPending] = useState(false);
+
+  useEffect(() => {
+    modal && setError(false);
+  }, [phoneNumberId, userToken, name]);
+
+  useEffect(() => {
+    if (channel?.sourceChannelId !== phoneNumberId && !!channel) {
+      setNotification({show: true, text: t('newChannelInfo'), info: true});
+      setNewButtonTitle(t('connect'));
+    } else {
+      setNewButtonTitle(buttonTitle);
+    }
+  }, [phoneNumberId]);
+
+  const buttonStatus = () => {
+    return (
+      !(phoneNumberId.length > 5 && userToken !== '' && name !== '') ||
+      (channel?.sourceChannelId === phoneNumberId &&
+        channel?.metadata?.pageToken === userToken &&
+        channel?.metadata?.name === name &&
+        channel?.metadata?.imageUrl === image) ||
+      (!!channel?.metadata?.imageUrl && image === '')
+    );
+  };
+
+  const connectNewChannel = () => {
+    const connectPayload: ConnectWhatsappRequestPayload = {
+      phoneNumberId: phoneNumberId,
+      userToken: userToken,
+      name: name,
+      ...(image &&
+        image !== '' && {
+          imageUrl: image,
+        }),
+    };
+
+    setIsPending(true);
+
+    connectWhatsappChannel(connectPayload)
+      .then(() => {
+        navigate(CONNECTORS_ROUTE + '/whatsapp/connected', {replace: true});
+      })
+      .catch((error: Error) => {
+        setNotification({show: true, text: t('updateFailed'), successful: false});
+        modal && setError(true);
+        console.error(error);
+      })
+      .finally(() => {
+        setIsPending(false);
+      });
+  };
+
+  return (
+    <div className={styles.wrapper}>
+      <div className={modal ? styles.inputContainerModal : styles.inputContainer}>
+        <Input
+          id="id"
+          label={t('whatsappPhoneNumberId')}
+          placeholder={t('whatsappPhoneNumberIdPlaceholder')}
+          showLabelIcon
+          tooltipText={t('whatsappPhoneNumberIdTooltip')}
+          value={phoneNumberId}
+          onChange={(event: React.ChangeEvent<HTMLInputElement>) => setPhoneNumberId(event.target.value)}
+          minLength={6}
+          required
+          height={32}
+          fontClass="font-base"
+        />
+        <Input
+          id="token"
+          label={t('token')}
+          placeholder={t('tokenPlaceholder')}
+          value={userToken}
+          showLabelIcon
+          tooltipText={t('token')}
+          onChange={(event: React.ChangeEvent<HTMLInputElement>) => setUserToken(event.target.value)}
+          required
+          height={32}
+          fontClass="font-base"
+        />
+        <Input
+          id="name"
+          label={t('name')}
+          placeholder={t('addAName')}
+          showLabelIcon
+          tooltipText={t('addName')}
+          value={name}
+          onChange={(event: React.ChangeEvent<HTMLInputElement>) => setName(event.target.value)}
+          required
+          height={32}
+          fontClass="font-base"
+        />
+        <Input
+          type="url"
+          id="image"
+          label={t('imageUrl')}
+          placeholder={t('addAnUrl')}
+          showLabelIcon
+          tooltipText={t('optional')}
+          value={image}
+          onChange={(event: React.ChangeEvent<HTMLInputElement>) => setImage(event.target.value)}
+          height={32}
+          fontClass="font-base"
+        />
+      </div>
+      <div className={`${modal ? styles.smartButtonModalContainer : styles.smartButtonContainer}`}>
+        <SmartButton
+          title={modal ? t('create') : newButtonTitle !== '' ? newButtonTitle : buttonTitle}
+          height={40}
+          width={160}
+          pending={isPending}
+          type="submit"
+          styleVariant="normal"
+          disabled={buttonStatus() || isPending}
+          onClick={() => connectNewChannel()}
+        />
+        {modal && <span className={error ? styles.errorMessage : ''}>{connectError}</span>}
+      </div>
+      {notification?.show && !modal && (
+        <NotificationComponent
+          type={notification.info ? 'sticky' : 'fade'}
+          show={notification.show}
+          text={notification.text}
+          successful={notification.successful}
+          info={notification.info}
+          setShowFalse={setNotification}
+        />
+      )}
+    </div>
+  );
+};
+
+export default connector(WhatsappConnect);
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Zendesk/ConnectNewZendesk.tsx b/frontend/control-center/src/pages/Connectors/Providers/Zendesk/ConnectNewZendesk.tsx
deleted file mode 100644
index 6d6458a00d..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/Zendesk/ConnectNewZendesk.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, {useState} from 'react';
-import {useSelector} from 'react-redux';
-import {StateModel} from '../../../../reducers';
-import {Input} from 'components';
-import {ConfigureConnector} from '../../ConfigureConnector';
-import styles from './index.module.scss';
-import {useTranslation} from 'react-i18next';
-import {ComponentName} from 'model';
-
-interface ConnectParams {
-  [key: string]: string;
-}
-
-type ConnectNewDialogflowProps = {
-  createNewConnection: (configValues: ConnectParams) => void;
-  isEnabled: boolean;
-  isConfigured: boolean;
-  isPending: boolean;
-};
-
-export const ConnectNewZendesk = ({
-  createNewConnection,
-  isEnabled,
-  isConfigured,
-  isPending,
-}: ConnectNewDialogflowProps) => {
-  const componentInfo = useSelector(
-    (state: StateModel) => state.data.connector[ComponentName.enterpriseZendenkConnector]
-  );
-  const [domain, setDomain] = useState(componentInfo?.domain || '');
-  const [username, setUsername] = useState(componentInfo?.username || '');
-  const [token, setToken] = useState(componentInfo?.token || '');
-  const [isUpdateModalVisible, setIsUpdateModalVisible] = useState(false);
-  const {t} = useTranslation();
-
-  const updateConfig = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    if (isEnabled) {
-      setIsUpdateModalVisible(true);
-    } else {
-      enableSubmitConfigData();
-    }
-  };
-
-  const enableSubmitConfigData = () => {
-    createNewConnection({domain, token, username});
-  };
-
-  return (
-    <ConfigureConnector
-      componentName={ComponentName.enterpriseZendenkConnector}
-      isUpdateModalVisible={isUpdateModalVisible}
-      setIsUpdateModalVisible={setIsUpdateModalVisible}
-      enableSubmitConfigData={enableSubmitConfigData}
-      disabled={
-        !domain ||
-        !username ||
-        !token ||
-        (componentInfo?.domain === domain && componentInfo?.username === username && componentInfo?.token === token)
-      }
-      isConfigured={isConfigured}
-      updateConfig={updateConfig}
-      isPending={isPending}
-    >
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="domain"
-          value={domain}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setDomain(e.target.value)}
-          label={t('ZendeskSubDomain')}
-          placeholder={t('AddDomain')}
-          showLabelIcon
-          tooltipText={t('ZendeskDomain')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="username"
-          value={username}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setUsername(e.target.value)}
-          label={t('username')}
-          placeholder={t('AddUsername')}
-          showLabelIcon
-          tooltipText={t('ZendeskUsername')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-      <div className={styles.formRow}>
-        <Input
-          type="text"
-          name="token"
-          value={token}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setToken(e.target.value)}
-          label={t('APIToken')}
-          placeholder={t('APIToken')}
-          showLabelIcon
-          tooltipText={t('ZendeskToken')}
-          required
-          height={32}
-          fontClass="font-base"
-        />
-      </div>
-    </ConfigureConnector>
-  );
-};
diff --git a/frontend/control-center/src/pages/Connectors/Providers/Zendesk/index.module.scss b/frontend/control-center/src/pages/Connectors/Providers/Zendesk/index.module.scss
deleted file mode 100644
index 422930afbf..0000000000
--- a/frontend/control-center/src/pages/Connectors/Providers/Zendesk/index.module.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@import 'assets/scss/fonts.scss';
-@import 'assets/scss/colors.scss';
-
-.formRow {
-  height: 80px;
-  margin-bottom: 16px;
-
-  label {
-    @include font-s;
-  }
-
-  &:hover {
-    .actionToolTip {
-      display: block;
-    }
-  }
-}
diff --git a/frontend/control-center/src/pages/Connectors/index.tsx b/frontend/control-center/src/pages/Connectors/index.tsx
index d1d96b0917..62a1f3a7b8 100644
--- a/frontend/control-center/src/pages/Connectors/index.tsx
+++ b/frontend/control-center/src/pages/Connectors/index.tsx
@@ -1,31 +1,16 @@
-import React, {useEffect, useState} from 'react';
-import {connect, ConnectedProps, useSelector} from 'react-redux';
-import {Channel, Source} from 'model';
+import React, {useEffect} from 'react';
+import {connect, ConnectedProps} from 'react-redux';
+import {Connector, Source} from 'model';
 import InfoCard from './InfoCard';
 import {StateModel} from '../../reducers';
-import {allChannelsConnected} from '../../selectors/channels';
 import {listChannels, listComponents, getConnectorsConfiguration} from '../../actions';
 import {setPageTitle} from '../../services/pageTitle';
 import {EmptyStateConnectors} from './EmptyStateConnectors';
 import {ChannelCard} from './ChannelCard';
 import {SimpleLoader} from 'components';
-import {getComponentStatus, formatComponentNameToConfigKey} from '../../services';
+import {getComponentStatus} from '../../services';
 import styles from './index.module.scss';
-
-export enum ComponentStatus {
-  enabled = 'Enabled',
-  notConfigured = 'Not Configured',
-  disabled = 'Disabled',
-  notHealthy = 'Not Healthy',
-}
-
-export interface ConnectorCardComponentInfo {
-  name: string;
-  displayName: string;
-  configKey: string;
-  isChannel?: string;
-  source: Source;
-}
+import {getMergedConnectors} from '../../selectors';
 
 const mapDispatchToProps = {
   listChannels,
@@ -33,96 +18,82 @@ const mapDispatchToProps = {
   listComponents,
 };
 
-const connector = connect(null, mapDispatchToProps);
-
-const Connectors = (props: ConnectedProps<typeof connector>) => {
-  const {listChannels, getConnectorsConfiguration, listComponents} = props;
-  const [connectorsPageList, setConnectorsPageList] = useState<[] | ConnectorCardComponentInfo[]>([]);
-  const channels = useSelector((state: StateModel) => Object.values(allChannelsConnected(state)));
-  const components = useSelector((state: StateModel) => state.data.config.components);
-  const connectors = useSelector((state: StateModel) => state.data.connector);
-  const catalogList = useSelector((state: StateModel) => state.data.catalog);
-  const channelsBySource = (Source: Source) => channels.filter((channel: Channel) => channel.source === Source);
-  const [hasInstalledComponents, setHasInstalledComponents] = useState(false);
-  const pageTitle = 'Connectors';
+const mapStateToProps = (state: StateModel) => {
+  return {
+    connectors: getMergedConnectors(state),
+  };
+};
 
-  const catalogListArr = Object.entries(catalogList);
-  const emptyCatalogList = catalogListArr.length === 0;
+const connector = connect(mapStateToProps, mapDispatchToProps);
 
-  useEffect(() => {
-    getConnectorsConfiguration();
-    if (emptyCatalogList) {
-      listComponents().catch((error: Error) => {
-        console.error(error);
-      });
-    } else {
-      const listArr = [];
-      catalogListArr.map(component => {
-        if (component[1].installed === true && component[1].source !== 'webhooks') {
-          setHasInstalledComponents(true);
-          listArr.push({
-            name: component[1].name,
-            displayName: component[1].displayName,
-            configKey: formatComponentNameToConfigKey(component[1].name),
-            source: component[1].source,
-            isChannel: component[1].isChannel,
-          });
-        }
-      });
+const Connectors = (props: ConnectedProps<typeof connector>) => {
+  const {connectors, listChannels, getConnectorsConfiguration, listComponents} = props;
+  const installedConnectors = Object.values(connectors).filter(
+    (connector: Connector) => connector.isInstalled && connector.source !== Source.webhooks && connector.price
+  );
+  const hasAvailableConnectors =
+    Object.values(connectors).filter((connector: Connector) => connector.source !== Source.webhooks && connector.price)
+      .length > 0;
 
-      setConnectorsPageList(listArr);
-    }
-  }, [catalogList]);
+  const hasInstalledComponents = installedConnectors.length > 0;
+  const pageTitle = 'Connectors';
+  const sortByName = (a: Connector, b: Connector) => a?.displayName?.localeCompare(b?.displayName);
 
   useEffect(() => {
-    if (channels.length === 0) {
-      listChannels().catch((error: Error) => {
-        console.error(error);
-      });
-    }
+    listChannels().catch((error: Error) => {
+      console.error(error);
+    });
+    getConnectorsConfiguration().catch((error: Error) => {
+      console.error(error);
+    });
+    listComponents().catch((error: Error) => {
+      console.error(error);
+    });
     setPageTitle(pageTitle);
-  }, [channels.length]);
+  }, []);
 
   return (
     <div className={styles.channelsWrapper}>
       <div className={styles.channelsHeadline}>
         <div>
           <h1 className={styles.channelsHeadlineText}>Connectors</h1>
-          {emptyCatalogList && <SimpleLoader />}
+          {!hasAvailableConnectors && <SimpleLoader />}
         </div>
       </div>
       <div className={styles.wrapper}>
-        {!hasInstalledComponents && catalogListArr.length > 0 ? (
+        {!hasInstalledComponents ? (
           <EmptyStateConnectors />
         ) : (
           <>
-            {connectorsPageList.map((item: ConnectorCardComponentInfo) => {
-              if (components && components[item.configKey] && connectors[item.configKey] && catalogList[item.name]) {
-                const isConfigured =
-                  Object.keys(connectors[item.configKey]).length > 0 || item.source === Source.chatPlugin;
-                const isEnabled = components[item.configKey]?.enabled;
-                const isHealthy = components[item.configKey]?.healthy;
-                const isInstalled = catalogList[item.name].installed;
-
-                if (item.isChannel === 'true') {
-                  return (
-                    <ChannelCard
-                      key={item.displayName}
-                      componentInfo={item}
-                      componentStatus={getComponentStatus(isHealthy, isInstalled, isConfigured, isEnabled)}
-                      channelsToShow={channelsBySource(item.source).length}
-                    />
-                  );
-                }
-                if (!item.isChannel) {
-                  return (
-                    <InfoCard
-                      key={item.displayName}
-                      componentInfo={item}
-                      componentStatus={getComponentStatus(isHealthy, isInstalled, isConfigured, isEnabled)}
-                    />
-                  );
-                }
+            {installedConnectors.sort(sortByName).map((connector: Connector) => {
+              if (connector.isChannel) {
+                return (
+                  <ChannelCard
+                    key={connector.name}
+                    componentInfo={connector}
+                    componentStatus={getComponentStatus(
+                      connector.isHealthy,
+                      connector.isInstalled,
+                      connector.isConfigured,
+                      connector.isEnabled
+                    )}
+                    channelsToShow={connector.connectedChannels}
+                  />
+                );
+              }
+              if (!connector.isChannel) {
+                return (
+                  <InfoCard
+                    key={connector.name}
+                    componentInfo={connector}
+                    componentStatus={getComponentStatus(
+                      connector.isHealthy,
+                      connector.isInstalled,
+                      connector.isConfigured,
+                      connector.isEnabled
+                    )}
+                  />
+                );
               }
             })}
           </>
diff --git a/frontend/control-center/src/pages/Inbox/ChannelsList/index.tsx b/frontend/control-center/src/pages/Inbox/ChannelsList/index.tsx
index bb4ee971f0..ee65527eac 100644
--- a/frontend/control-center/src/pages/Inbox/ChannelsList/index.tsx
+++ b/frontend/control-center/src/pages/Inbox/ChannelsList/index.tsx
@@ -15,7 +15,6 @@ import {ReactComponent as PlusIcon} from 'assets/images/icons/plus.svg';
 import {ReactComponent as CloseIcon} from 'assets/images/icons/close.svg';
 
 import styles from './index.module.scss';
-import {cyChannelsFormBackButton} from 'handles';
 import {CONNECTORS_ROUTE} from '../../../routes/routes';
 import {getChannelAvatar} from '../../../components/ChannelAvatar';
 import {useTranslation} from 'react-i18next';
@@ -81,7 +80,7 @@ const ChannelsList = () => {
 
   return (
     <div className={styles.wrapper}>
-      <LinkButton dataCy={cyChannelsFormBackButton} onClick={() => navigate(-1)} type="button">
+      <LinkButton onClick={() => navigate(-1)} type="button">
         <div className={styles.linkButtonContainer}>
           <ArrowLeftIcon className={styles.backIcon} />
           {connectorsRoute ? t('channelsCapital') : ''}
diff --git a/frontend/control-center/src/pages/Inbox/InboxOutlet.tsx b/frontend/control-center/src/pages/Inbox/InboxOutlet.tsx
deleted file mode 100644
index 80d96e46f5..0000000000
--- a/frontend/control-center/src/pages/Inbox/InboxOutlet.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import {Outlet} from 'react-router-dom';
-
-const InboxOutlet = () => {
-  return <Outlet />;
-};
-
-export default InboxOutlet;
diff --git a/frontend/control-center/src/pages/Status/ComponentListItem/ItemInfo.tsx b/frontend/control-center/src/pages/Status/ComponentListItem/ItemInfo.tsx
index c115d88f20..cf8b97a43f 100644
--- a/frontend/control-center/src/pages/Status/ComponentListItem/ItemInfo.tsx
+++ b/frontend/control-center/src/pages/Status/ComponentListItem/ItemInfo.tsx
@@ -5,11 +5,12 @@ import {ReactComponent as CheckmarkIcon} from 'assets/images/icons/checkmarkFill
 import {ReactComponent as UncheckedIcon} from 'assets/images/icons/uncheckIcon.svg';
 import {ReactComponent as ArrowRight} from 'assets/images/icons/arrowRight.svg';
 import {getChannelAvatar} from '../../../components/ChannelAvatar';
-import {ComponentName, Source} from 'model';
+import {Source} from 'model';
 import {SettingsModal, Button, Toggle, Tooltip} from 'components';
 import {connect, ConnectedProps, useSelector} from 'react-redux';
 import {useTranslation} from 'react-i18next';
 import styles from './index.module.scss';
+import {CONNECTORS_ROUTE} from '../../../routes/routes';
 
 type ComponentInfoProps = {
   healthy: boolean;
@@ -36,13 +37,15 @@ const ItemInfo = (props: ComponentInfoProps) => {
   const [componentEnabled, setComponentEnabled] = useState(enabled);
   const [enablePopupVisible, setEnablePopupVisible] = useState(false);
   const isVisible = isExpanded || isComponent;
+  const navigateConfigure = `${CONNECTORS_ROUTE}/${source}/configure`;
   const {t} = useTranslation();
 
   const isConfigurableConnector = () => {
     let isConfigurable = false;
 
     Object.entries(catalogList).forEach(elem => {
-      if (elem[1] && elem[1].source && elem[1].source === source) isConfigurable = true;
+      if (elem[1] && elem[1].source && elem[1].source === source && elem[1].source !== Source.webhooks)
+        isConfigurable = true;
     });
 
     return isConfigurable;
@@ -56,11 +59,9 @@ const ItemInfo = (props: ComponentInfoProps) => {
     connector &&
     connectors[itemName] &&
     isComponent &&
-    enabled &&
-    healthy &&
     isConfigurableConnector() &&
     !isComponentConfigured &&
-    itemName !== ComponentName.sourcesChatPlugin;
+    !itemName.includes(Source.chatPlugin);
   const isRunning = healthy && enabled;
   const isNotHealthy = !healthy && enabled;
   const isDisabled = !enabled;
@@ -108,19 +109,13 @@ const ItemInfo = (props: ComponentInfoProps) => {
           </div>
 
           <div className={styles.healthyStatus}>
-            {needsConfig ? (
-              <Tooltip
-                hoverElement={<UncheckedIcon className={`${styles.icons} ${styles.installedNotConfigured}`} />}
-                hoverElementHeight={20}
-                hoverElementWidth={20}
-                tooltipContent={t('needsConfiguration')}
-              />
-            ) : isRunning ? (
+            {isRunning ? (
               <Tooltip
                 hoverElement={<CheckmarkIcon className={`${styles.icons} ${styles.runningHealthy}`} />}
                 hoverElementHeight={20}
                 hoverElementWidth={20}
                 tooltipContent={t('enabled')}
+                direction="right"
               />
             ) : isNotHealthy ? (
               <Tooltip
@@ -128,6 +123,7 @@ const ItemInfo = (props: ComponentInfoProps) => {
                 hoverElementHeight={20}
                 hoverElementWidth={20}
                 tooltipContent={t('notHealthy')}
+                direction="right"
               />
             ) : (
               isDisabled && (
@@ -136,16 +132,28 @@ const ItemInfo = (props: ComponentInfoProps) => {
                   hoverElementHeight={20}
                   hoverElementWidth={20}
                   tooltipContent={t('disabled')}
+                  direction="right"
                 />
               )
             )}
           </div>
-
-          {isComponent && !needsConfig && (
-            <div className={styles.enabled}>
-              <Toggle value={componentEnabled} updateValue={onEnableComponent} size="small" variant="green" />
-            </div>
-          )}
+          {isComponent &&
+            (!needsConfig ? (
+              <div className={styles.enabled}>
+                <Toggle value={componentEnabled} updateValue={onEnableComponent} size="small" variant="green" />
+              </div>
+            ) : (
+              <div className={styles.enabled}>
+                <Tooltip
+                  hoverElement={<UncheckedIcon className={`${styles.icons} ${styles.installedNotConfigured}`} />}
+                  hoverElementHeight={20}
+                  hoverElementWidth={20}
+                  tooltipContent={t('needsConfiguration')}
+                  direction="right"
+                  navigateTo={navigateConfigure}
+                />
+              </div>
+            ))}
         </div>
       )}
 
diff --git a/frontend/control-center/src/pages/Status/index.tsx b/frontend/control-center/src/pages/Status/index.tsx
index 179115e26a..c386bc2606 100644
--- a/frontend/control-center/src/pages/Status/index.tsx
+++ b/frontend/control-center/src/pages/Status/index.tsx
@@ -1,26 +1,31 @@
 import React, {useEffect, useState} from 'react';
-import {connect, ConnectedProps, useSelector} from 'react-redux';
-import {getClientConfig, getConnectorsConfiguration, listComponents} from '../../actions';
+import {connect, ConnectedProps} from 'react-redux';
+import {getClientConfig, getConnectorsConfiguration, listChannels, listComponents} from '../../actions';
 import {StateModel} from '../../reducers';
 import {ComponentListItem} from './ComponentListItem';
 import {ReactComponent as RefreshIcon} from 'assets/images/icons/refreshIcon.svg';
 import {setPageTitle} from '../../services/pageTitle';
 import {useTranslation} from 'react-i18next';
-import {ComponentRepository} from 'model';
 import styles from './index.module.scss';
 
 const mapDispatchToProps = {
   getClientConfig,
   getConnectorsConfiguration,
   listComponents,
+  listChannels,
 };
 
-const connector = connect(null, mapDispatchToProps);
+const mapStateToProps = (state: StateModel) => {
+  return {
+    components: Object.entries(state.data.config.components),
+    catalog: state.data.catalog,
+  };
+};
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
 
 const Status = (props: ConnectedProps<typeof connector>) => {
-  const {getClientConfig, getConnectorsConfiguration, listComponents} = props;
-  const components = useSelector((state: StateModel) => Object.entries(state.data.config.components));
-  const catalogList = useSelector((state: StateModel) => state.data.catalog);
+  const {components, catalog, getClientConfig, getConnectorsConfiguration, listComponents, listChannels} = props;
   const [spinAnim, setSpinAnim] = useState(true);
   const [lastRefresh, setLastRefresh] = useState(new Date().toLocaleString());
   const {t} = useTranslation();
@@ -40,6 +45,9 @@ const Status = (props: ConnectedProps<typeof connector>) => {
     listComponents().catch((error: Error) => {
       console.error(error);
     });
+    listChannels().catch((error: Error) => {
+      console.error(error);
+    });
   }, []);
 
   const handleRefresh = () => {
@@ -57,9 +65,9 @@ const Status = (props: ConnectedProps<typeof connector>) => {
   const formatToComponentName = (name: string) => {
     let formattedName;
     if (name.includes('enterprise')) {
-      formattedName = `${ComponentRepository.airyEnterprise}/${name}`;
+      formattedName = `airy-enterprise/${name}`;
     } else {
-      formattedName = `${ComponentRepository.airyCore}/${name}`;
+      formattedName = `airy-core/${name}`;
     }
 
     return formattedName;
@@ -86,10 +94,10 @@ const Status = (props: ConnectedProps<typeof connector>) => {
         </button>
       </div>
       <div className={styles.listItems}>
-        {Object.entries(catalogList).length > 0 &&
+        {Object.entries(catalog).length > 0 &&
           components.map((component, index) => {
             const formattedName = formatToComponentName(component[0]);
-            const catalogItem = catalogList[formattedName];
+            const catalogItem = catalog[formattedName];
             return (
               <ComponentListItem
                 key={index}
diff --git a/frontend/control-center/src/routes/routes.ts b/frontend/control-center/src/routes/routes.ts
index ba07d6c2d7..8e53c55aee 100644
--- a/frontend/control-center/src/routes/routes.ts
+++ b/frontend/control-center/src/routes/routes.ts
@@ -3,32 +3,9 @@ export const ROOT_ROUTE = '/';
 export const CONNECTORS_ROUTE = '/connectors';
 
 export const CATALOG_ROUTE = '/catalog';
-export const CATALOG_FACEBOOK_ROUTE = '/catalog/facebook';
-export const CATALOG_CHAT_PLUGIN_ROUTE = '/catalog/chatplugin';
-export const CATALOG_TWILIO_SMS_ROUTE = '/catalog/twilio.sms';
-export const CATALOG_TWILIO_WHATSAPP_ROUTE = '/catalog/twilio.whatsapp';
-export const CATALOG_WHATSAPP_BUSINESS_CLOUD_ROUTE = '/catalog/whatsapp-cloud';
-export const CATALOG_GOOGLE_ROUTE = '/catalog/google';
-export const CATALOG_INSTAGRAM_ROUTE = '/catalog/instagram';
-export const CATALOG_DIALOGFLOW_ROUTE = '/catalog/dialogflow';
-export const CATALOG_ZENDESK_ROUTE = '/catalog/zendesk';
-export const CATALOG_SALESFORCE_ROUTE = '/catalog/salesforce';
-export const CATALOG_CONGNIFY_ROUTE = '/catalog/congnify';
-export const CATALOG_AMELIA_ROUTE = '/catalog/amelia';
-export const CATALOG_FRONTEND_INBOX_ROUTE = '/catalog/frontend-inbox';
-export const CATALOG_RASA_ROUTE = '/catalog/rasa';
-export const CATALOG_WEBHOOKS_ROUTE = '/catalog/webhooks';
-export const CATALOG_MOBILE_ROUTE = '/catalog/mobile';
-export const CATALOG_VIBER_ROUTE = '/catalog/viber';
 
 export const INBOX_ROUTE = '/inbox';
-export const INBOX_CONNECTED_ROUTE = '/inbox/connected';
-export const INBOX_FACEBOOK_ROUTE = '/inbox/facebook';
-export const INBOX_CHAT_PLUGIN_ROUTE = '/inbox/chatplugin';
-export const INBOX_TWILIO_SMS_ROUTE = '/inbox/twilio.sms';
-export const INBOX_TWILIO_WHATSAPP_ROUTE = '/inbox/twilio.whatsapp';
-export const INBOX_GOOGLE_ROUTE = '/inbox/google';
-export const INBOX_INSTAGRAM_ROUTE = '/inbox/instagram';
 
 export const STATUS_ROUTE = '/status';
+
 export const WEBHOOKS_ROUTE = '/webhooks';
diff --git a/frontend/control-center/src/selectors/components.ts b/frontend/control-center/src/selectors/components.ts
new file mode 100644
index 0000000000..5acb7dce7b
--- /dev/null
+++ b/frontend/control-center/src/selectors/components.ts
@@ -0,0 +1,13 @@
+import {StateModel} from '../reducers';
+import {useSelector} from 'react-redux';
+import {Source, ComponentInfo} from 'model';
+
+export const useCurrentComponentForSource = (source: Source) => {
+  const catalog = useSelector((state: StateModel) => state.data.catalog);
+  const componentInfoArr: [string, ComponentInfo][] = Object.entries(catalog).filter(item => item[1].source === source);
+
+  const componentInfoArrFlat = componentInfoArr.flat() as [string, ComponentInfo];
+  const [name] = componentInfoArrFlat;
+
+  return {name: name, ...componentInfoArrFlat[1]};
+};
diff --git a/frontend/control-center/src/selectors/connectors.ts b/frontend/control-center/src/selectors/connectors.ts
new file mode 100644
index 0000000000..d1e242836a
--- /dev/null
+++ b/frontend/control-center/src/selectors/connectors.ts
@@ -0,0 +1,84 @@
+import {StateModel} from '../reducers';
+import {useSelector} from 'react-redux';
+import {Channel, Connector, ConnectorName, ConnectorsModel, Source} from 'model';
+import {createSelector} from 'reselect';
+import {merge} from 'lodash-es';
+import {removePrefix} from '../services';
+import {allChannelsConnected} from './channels';
+
+export const useCurrentConnectorForSource = (source: Source) => {
+  const connectors = useSelector((state: StateModel) => state.data.connector);
+  const connectorInfoArr = Object.entries(connectors).filter(item => item[0].includes(source));
+
+  const connectorInfoArrFlat = connectorInfoArr.flat() as [string, {[key: string]: string}];
+
+  return {...connectorInfoArrFlat[1]};
+};
+
+export const getMergedConnectors = createSelector(
+  (state: StateModel) => state.data.catalog,
+  (state: StateModel) => state.data.config.components,
+  (state: StateModel) => state.data.connector,
+  (state: StateModel) => Object.values(allChannelsConnected(state)),
+  (catalog, components, connectors, channels) => {
+    let structuredConnector: Connector = {};
+    let structuredCatalog: Connector = {};
+    let structuredComponent: Connector = {};
+    const catalogList: ConnectorsModel = {};
+    const connectorsList: ConnectorsModel = {};
+    const componentsList: ConnectorsModel = {};
+
+    Object.entries(catalog).map(catalog => {
+      const channelsBySource = (Source: Source) => channels.filter((channel: Channel) => channel.source === Source);
+      const connectedChannels = channelsBySource(catalog[1].source).length;
+      const isChannel = catalog[1].isChannel?.includes('true') ?? false;
+      const isInstalled = catalog[1].installed;
+      const price = catalog[1].price;
+      const source = catalog[1].source;
+      const name = removePrefix(catalog[0]);
+      const displayName = catalog[1].displayName;
+
+      structuredCatalog = {
+        name: name,
+        displayName: displayName,
+        isInstalled: isInstalled,
+        isConfigured: !isInstalled && false,
+        isHealthy: !isInstalled && false,
+        isEnabled: !isInstalled && false,
+        isChannel: isChannel,
+        price: price,
+        source: source,
+        connectedChannels: connectedChannels,
+      };
+      catalogList[structuredCatalog.name] = structuredCatalog;
+    });
+
+    Object.entries(connectors).map(connector => {
+      let isConfigured = false;
+      if (Object.values(connector[1]).length > 0 || connector[0] === ConnectorName.sourcesChatPlugin) {
+        isConfigured = true;
+      }
+
+      structuredConnector = {
+        name: connector[0],
+        configureValues: connector[1],
+        isConfigured: isConfigured,
+      };
+
+      connectorsList[structuredConnector.name] = structuredConnector;
+    });
+
+    Object.entries(components).map(component => {
+      structuredComponent = {
+        name: component[0],
+        isEnabled: component[1].enabled,
+        isHealthy: component[1].healthy,
+      };
+      componentsList[structuredComponent.name] = structuredComponent;
+    });
+
+    const mergedConnectors = merge(catalogList, connectorsList, componentsList);
+
+    return mergedConnectors;
+  }
+);
diff --git a/frontend/control-center/src/selectors/index.ts b/frontend/control-center/src/selectors/index.ts
new file mode 100644
index 0000000000..4611d61124
--- /dev/null
+++ b/frontend/control-center/src/selectors/index.ts
@@ -0,0 +1,3 @@
+export * from './channels';
+export * from './components';
+export * from './connectors';
diff --git a/frontend/control-center/src/services/format.ts b/frontend/control-center/src/services/format.ts
index 8bc74f8d48..d870486f38 100644
--- a/frontend/control-center/src/services/format.ts
+++ b/frontend/control-center/src/services/format.ts
@@ -8,4 +8,7 @@ const capitalize = (str: string) => {
 
 export const removePrefix = (name: string) => name.split('/').pop();
 
-export const formatComponentNameToConfigKey = (componentName: string) => componentName.split('/')[1];
+export const formatComponentNameToConfigKey = (componentName: string) => {
+  if (!componentName) return null;
+  return componentName.split('/')[1];
+};
diff --git a/frontend/control-center/src/services/getComponentStatus.ts b/frontend/control-center/src/services/getComponentStatus.ts
index e597b50aa9..186ee79214 100644
--- a/frontend/control-center/src/services/getComponentStatus.ts
+++ b/frontend/control-center/src/services/getComponentStatus.ts
@@ -1,4 +1,4 @@
-import {ComponentStatus} from '../pages/Connectors';
+import {ComponentStatus} from 'model';
 
 export const getComponentStatus = (
   isHealthy: boolean,
@@ -6,8 +6,8 @@ export const getComponentStatus = (
   isConfigured: boolean,
   isEnabled: boolean
 ) => {
-  if (isInstalled && !isEnabled) return ComponentStatus.disabled;
-  if (!isHealthy) return ComponentStatus.notHealthy;
   if (isInstalled && !isConfigured) return ComponentStatus.notConfigured;
+  if (isInstalled && !isEnabled) return ComponentStatus.disabled;
+  if (isInstalled && isConfigured && isEnabled && !isHealthy) return ComponentStatus.notHealthy;
   if (isInstalled && isConfigured && isEnabled) return ComponentStatus.enabled;
 };
diff --git a/frontend/control-center/src/services/getRouteForCard.ts b/frontend/control-center/src/services/getRouteForCard.ts
index 8c0e420d9b..b2c7235be9 100644
--- a/frontend/control-center/src/services/getRouteForCard.ts
+++ b/frontend/control-center/src/services/getRouteForCard.ts
@@ -1,73 +1,31 @@
-import {
-  CONNECTORS_ROUTE,
-  CATALOG_FACEBOOK_ROUTE,
-  CATALOG_CHAT_PLUGIN_ROUTE,
-  CATALOG_TWILIO_SMS_ROUTE,
-  CATALOG_TWILIO_WHATSAPP_ROUTE,
-  CATALOG_WHATSAPP_BUSINESS_CLOUD_ROUTE,
-  CATALOG_GOOGLE_ROUTE,
-  CATALOG_INSTAGRAM_ROUTE,
-  CATALOG_DIALOGFLOW_ROUTE,
-  CATALOG_ZENDESK_ROUTE,
-  CATALOG_SALESFORCE_ROUTE,
-  CATALOG_CONGNIFY_ROUTE,
-  CATALOG_AMELIA_ROUTE,
-  CATALOG_FRONTEND_INBOX_ROUTE,
-  CATALOG_RASA_ROUTE,
-  CATALOG_WEBHOOKS_ROUTE,
-  CATALOG_MOBILE_ROUTE,
-  CATALOG_VIBER_ROUTE,
-  WEBHOOKS_ROUTE,
-} from '../routes/routes';
+import {CONNECTORS_ROUTE, CATALOG_ROUTE, WEBHOOKS_ROUTE} from '../routes/routes';
 import {Source} from 'model';
 
-export const getConnectedRouteForComponent = (source: Source, isChannel: string) => {
+export const getConnectedRouteForComponent = (
+  source: Source,
+  isChannel?: boolean,
+  hasConnectedChannels?: boolean,
+  configured?: boolean
+) => {
   if (source === Source.webhooks) return WEBHOOKS_ROUTE;
 
-  if (isChannel) return `${CONNECTORS_ROUTE}/${source}/connected`;
+  if ((!configured || !isChannel) && source !== Source.chatPlugin) return `${CONNECTORS_ROUTE}/${source}/configure`;
 
-  return `${CONNECTORS_ROUTE}/${source}/new`;
+  if (configured && hasConnectedChannels) return `${CONNECTORS_ROUTE}/${source}/connected`;
+
+  if (configured && !hasConnectedChannels) return `${CONNECTORS_ROUTE}/${source}/new`;
+
+  return `${CONNECTORS_ROUTE}/${source}/connected`;
 };
 
-export const getNewChannelRouteForComponent = (source: Source) => {
-  return source === Source.webhooks ? WEBHOOKS_ROUTE : `${CONNECTORS_ROUTE}/${source}/new`;
+export const getNewChannelRouteForComponent = (source: Source, isChannel?: boolean, configured?: boolean) => {
+  if (source === Source.webhooks) return WEBHOOKS_ROUTE;
+
+  if ((!configured || !isChannel) && source !== Source.chatPlugin) return `${CONNECTORS_ROUTE}/${source}/configure`;
+
+  return `${CONNECTORS_ROUTE}/${source}/new`;
 };
 
-export const getCatalogProductRouteForComponent = (displayName: string) => {
-  switch (displayName) {
-    case 'Airy Chat Plugin':
-      return CATALOG_CHAT_PLUGIN_ROUTE;
-    case 'Facebook Messenger':
-      return CATALOG_FACEBOOK_ROUTE;
-    case 'Twilio SMS':
-      return CATALOG_TWILIO_SMS_ROUTE;
-    case 'Twilio WhatsApp':
-      return CATALOG_TWILIO_WHATSAPP_ROUTE;
-    case 'WhatsApp Business Cloud':
-      return CATALOG_WHATSAPP_BUSINESS_CLOUD_ROUTE;
-    case 'Google Business Messages':
-      return CATALOG_GOOGLE_ROUTE;
-    case 'Instagram':
-      return CATALOG_INSTAGRAM_ROUTE;
-    case 'Dialogflow':
-      return CATALOG_DIALOGFLOW_ROUTE;
-    case 'Salesforce':
-      return CATALOG_SALESFORCE_ROUTE;
-    case 'Zendesk':
-      return CATALOG_ZENDESK_ROUTE;
-    case 'Congnigy':
-      return CATALOG_CONGNIFY_ROUTE;
-    case 'Amelia':
-      return CATALOG_AMELIA_ROUTE;
-    case 'Inbox':
-      return CATALOG_FRONTEND_INBOX_ROUTE;
-    case 'Rasa':
-      return CATALOG_RASA_ROUTE;
-    case 'Mobile':
-      return CATALOG_MOBILE_ROUTE;
-    case 'Webhooks':
-      return CATALOG_WEBHOOKS_ROUTE;
-    case 'Viber':
-      return CATALOG_VIBER_ROUTE;
-  }
+export const getCatalogProductRouteForComponent = (source: Source) => {
+  return `${CATALOG_ROUTE}/${source}`;
 };
diff --git a/frontend/inbox/handles/index.ts b/frontend/inbox/handles/index.ts
index 482cace97a..bf28c1ccc7 100644
--- a/frontend/inbox/handles/index.ts
+++ b/frontend/inbox/handles/index.ts
@@ -22,12 +22,6 @@ export const cyTagsTableRowDisplayDeleteModalButton = 'tagsTableRowDisplayDelete
 export const cyConnectorAddButton = 'connectorAddButton';
 export const cyAddChannelButton = 'addChannelButton';
 
-export const cyChannelsChatPluginAddButton = 'channelsChatPluginAddButton';
-export const cyChannelsFacebookAddButton = 'channelsFacebookAddButton';
-export const cyChannelsTwilioSmsAddButton = 'channelsTwilioSmsAddButton';
-export const cyChannelsTwilioWhatsappAddButton = 'channelsTwilioWhatsappAddButton';
-export const cyChannelsGoogleAddButton = 'channelsGoogleAddButton';
-
 export const cyChannelsChatPluginList = 'channelsChatPluginList';
 export const cyChannelsFacebookList = 'channelsFacebookList';
 export const cyChannelsTwilioSmsList = 'channelsTwilioSmsList';
@@ -39,7 +33,6 @@ export const cyConnectorsAddNewButton = 'connectorsAddNewButton';
 export const cyChannelsChatPluginFormNameInput = 'channelsChatPluginFormNameInput';
 export const cyChannelsChatPluginFormSubmitButton = 'channelsChatPluginFormSubmitButton';
 export const cyChannelCreatedChatPluginCloseButton = 'channelCreatedChatPluginCloseButton';
-export const cyChannelsFormBackButton = 'channelsFormBackButton';
 
 export const cyOpenStateButton = 'openStateButton';
 export const cyClosedStateButton = 'closedStateButton';
@@ -72,4 +65,3 @@ export const cyChannelsInstagramList = 'cyChannelsInstagramList';
 export const cyConversationsListForContact = 'conversationsListForContact';
 export const cyConversationForContactButton = 'conversationForContactButton';
 export const cyContactItem = 'contactItem';
-export const cyContactsCollapseIcon = 'contactsCollapseIcon';
diff --git a/frontend/inbox/src/actions/contacts/index.ts b/frontend/inbox/src/actions/contacts/index.ts
index 75e3857e78..1dd976a556 100644
--- a/frontend/inbox/src/actions/contacts/index.ts
+++ b/frontend/inbox/src/actions/contacts/index.ts
@@ -28,7 +28,7 @@ export const listContactsAction = createAction(CONTACT_LIST, (contacts: Contact[
 
 export const deleteContactAction = createAction(CONTACT_DELETE, (id: string) => id)<string>();
 
-export const listContacts = () => (dispatch: Dispatch<any>, state: () => StateModel) => {
+export const listContacts = () => async (dispatch: Dispatch<any>, state: () => StateModel) => {
   const pageSize = 54;
   const cursor = state().data.contacts.all.paginationData.nextCursor;
   HttpClientInstance.listContacts({page_size: pageSize, cursor: cursor}).then(
@@ -40,7 +40,7 @@ export const listContacts = () => (dispatch: Dispatch<any>, state: () => StateMo
 };
 
 //deleteContact is disabled in the Contacts page (temporarily)
-export const deleteContact = (id: string) => (dispatch: Dispatch<any>) => {
+export const deleteContact = (id: string) => async (dispatch: Dispatch<any>) => {
   HttpClientInstance.deleteContact(id).then(() => {
     dispatch(deleteContactAction(id));
     return Promise.resolve(true);
@@ -49,7 +49,7 @@ export const deleteContact = (id: string) => (dispatch: Dispatch<any>) => {
 
 export const getContactDetails =
   ({id, conversationId}: GetContactDetailsRequestPayload) =>
-  (dispatch: Dispatch<any>) => {
+  async (dispatch: Dispatch<any>) => {
     return HttpClientInstance.getContactDetails({id, conversationId}).then((response: Contact) => {
       dispatch(getContactDetailsAction(response.id, response));
       return Promise.resolve(response.id);
@@ -57,7 +57,7 @@ export const getContactDetails =
   };
 
 export const updateContactDetails =
-  (updateContactDetailsRequestPayload: UpdateContactDetailsRequestPayload) => (dispatch: Dispatch<any>) => {
+  (updateContactDetailsRequestPayload: UpdateContactDetailsRequestPayload) => async (dispatch: Dispatch<any>) => {
     return HttpClientInstance.updateContactDetails(updateContactDetailsRequestPayload).then(() => {
       dispatch(updateContactDetailsAction(updateContactDetailsRequestPayload));
       return Promise.resolve(true);
diff --git a/frontend/inbox/src/components/ContactDetails/index.tsx b/frontend/inbox/src/components/ContactDetails/index.tsx
index 4cc407cdf1..f5be1eaa44 100644
--- a/frontend/inbox/src/components/ContactDetails/index.tsx
+++ b/frontend/inbox/src/components/ContactDetails/index.tsx
@@ -186,7 +186,9 @@ const ContactDetails = (props: ContactDetailsProps) => {
       organization
     );
 
-    updateContactDetails({...infoDetailsPayload});
+    updateContactDetails({...infoDetailsPayload}).catch((error: Error) => {
+      console.error(error);
+    });
     updateContactType(infoDetailsPayload);
     getUpdatedInfo();
     fillContactInfo({...infoDetailsPayload}, setEmail, setPhone, setTitle, setAddress, setCity, setOrganization);
diff --git a/frontend/inbox/src/components/DialogCustomizable/index.module.scss b/frontend/inbox/src/components/DialogCustomizable/index.module.scss
index 36116c2794..93dfcce61b 100644
--- a/frontend/inbox/src/components/DialogCustomizable/index.module.scss
+++ b/frontend/inbox/src/components/DialogCustomizable/index.module.scss
@@ -4,7 +4,7 @@
   position: absolute;
   background-color: var(--color-background-white);
   border: 1px solid var(--color-light-gray);
-  border-radius: 4px;
+  border-radius: 10px;
   z-index: $popup;
 }
 
diff --git a/frontend/inbox/src/components/Sidebar/index.module.scss b/frontend/inbox/src/components/Sidebar/index.module.scss
index 04a73d2567..9be06f4a81 100644
--- a/frontend/inbox/src/components/Sidebar/index.module.scss
+++ b/frontend/inbox/src/components/Sidebar/index.module.scss
@@ -79,7 +79,7 @@
   background-color: var(--color-blue-white);
 }
 
-.inaction {
+.inactive {
   display: none;
 }
 
diff --git a/frontend/inbox/src/components/Sidebar/index.tsx b/frontend/inbox/src/components/Sidebar/index.tsx
index 5515356b8d..4b0f2fb8b6 100644
--- a/frontend/inbox/src/components/Sidebar/index.tsx
+++ b/frontend/inbox/src/components/Sidebar/index.tsx
@@ -10,7 +10,6 @@ import {CONTACTS_ROUTE, INBOX_ROUTE, TAGS_ROUTE} from '../../routes/routes';
 import styles from './index.module.scss';
 import {connect, ConnectedProps} from 'react-redux';
 import {StateModel} from '../../reducers';
-import {ComponentName} from 'model';
 
 type SideBarProps = {} & ConnectedProps<typeof connector>;
 
@@ -20,6 +19,7 @@ const mapStateToProps = (state: StateModel) => ({
 });
 
 const connector = connect(mapStateToProps);
+const apiContactsComponent = 'api-contacts';
 
 const Sidebar = (props: SideBarProps) => {
   const isActive = (route: string) => {
@@ -28,10 +28,10 @@ const Sidebar = (props: SideBarProps) => {
 
   useEffect(() => {
     Object.entries(props.components).length > 0 &&
-      setContactsEnabled(props.components[ComponentName.apiContacts]?.enabled || false);
+      setContactsEnabled(props.components[apiContactsComponent]?.enabled || false);
   }, [props.components]);
 
-  const [contactsEnabled, setContactsEnabled] = useState(props.components[ComponentName.apiContacts]?.enabled || false);
+  const [contactsEnabled, setContactsEnabled] = useState(props.components[apiContactsComponent]?.enabled || false);
 
   return (
     <nav className={styles.wrapper}>
diff --git a/frontend/inbox/src/components/TopBar/index.tsx b/frontend/inbox/src/components/TopBar/index.tsx
index fdce17e9c4..7b5fd3c48c 100644
--- a/frontend/inbox/src/components/TopBar/index.tsx
+++ b/frontend/inbox/src/components/TopBar/index.tsx
@@ -30,7 +30,7 @@ const mapStateToProps = (state: StateModel) => ({
   version: state.data.config.clusterVersion,
 });
 
-const controlCenterUrl = `${env.API_HOST}/control-center`;
+const controlCenterUrl = `${env.API_HOST}/control-center/`;
 const logoutUrl = `${env.API_HOST}/logout`;
 
 const connector = connect(mapStateToProps);
diff --git a/frontend/inbox/src/pages/Contacts/ContactInformation/index.module.scss b/frontend/inbox/src/pages/Contacts/ContactInformation/index.module.scss
index 7a2aa603c5..eb1b32662b 100644
--- a/frontend/inbox/src/pages/Contacts/ContactInformation/index.module.scss
+++ b/frontend/inbox/src/pages/Contacts/ContactInformation/index.module.scss
@@ -199,21 +199,3 @@
     fill: var(--color-text-gray);
   }
 }
-
-.contactsDetailsCollapseIcon {
-  position: absolute;
-  left: 20px;
-  top: 20px;
-  width: 20px;
-  background: transparent;
-  border: none;
-  cursor: pointer;
-  transition: opacity 0.3s;
-  svg {
-    fill: var(--color-airy-blue);
-  }
-}
-
-.contactsDetailsCollapseIcon:hover {
-  opacity: 0.5;
-}
diff --git a/frontend/inbox/src/pages/Contacts/ContactInformation/index.tsx b/frontend/inbox/src/pages/Contacts/ContactInformation/index.tsx
index 82caaa5359..577fdfa0be 100644
--- a/frontend/inbox/src/pages/Contacts/ContactInformation/index.tsx
+++ b/frontend/inbox/src/pages/Contacts/ContactInformation/index.tsx
@@ -1,5 +1,5 @@
 import {updateContactDetails, updateConversationContactInfo} from '../../../actions';
-import React, {useEffect, useState} from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
 import {useTranslation} from 'react-i18next';
 import {connect, ConnectedProps} from 'react-redux';
 import styles from './index.module.scss';
@@ -13,7 +13,6 @@ import {ReactComponent as CloseIcon} from 'assets/images/icons/close.svg';
 import {ReactComponent as CheckmarkCircleIcon} from 'assets/images/icons/checkmark.svg';
 import {ReactComponent as EditIcon} from 'assets/images/icons/pen.svg';
 import {ReactComponent as CancelIcon} from 'assets/images/icons/cancelCross.svg';
-import {ReactComponent as CollapseRightArrowsIcon} from 'assets/images/icons/collapseRightArrows.svg';
 import {StateModel} from '../../../reducers';
 import {
   cyCancelEditContactIcon,
@@ -22,7 +21,6 @@ import {
   cyEditContactIcon,
   cyEditDisplayNameCheckmark,
   cyEditDisplayNameIcon,
-  cyContactsCollapseIcon,
 } from 'handles';
 
 const mapStateToProps = (state: StateModel) => ({
@@ -42,8 +40,6 @@ type ContactInformationProps = {
   editModeOn: boolean;
   cancelEdit: boolean;
   setEditModeOn: (editing: boolean) => void;
-  setContactInformationVisible: React.Dispatch<React.SetStateAction<boolean>>;
-  contactInformationVisible: boolean;
 } & ConnectedProps<typeof connector>;
 
 const ContactInformation = (props: ContactInformationProps) => {
@@ -56,8 +52,6 @@ const ContactInformation = (props: ContactInformationProps) => {
     editModeOn,
     cancelEdit,
     setEditModeOn,
-    setContactInformationVisible,
-    contactInformationVisible,
   } = props;
   const {t} = useTranslation();
   const [showEditDisplayName, setShowEditDisplayName] = useState(false);
@@ -83,7 +77,9 @@ const ContactInformation = (props: ContactInformationProps) => {
   }, [editModeOn, isContactDetailsExpanded, cancelEdit]);
 
   const saveEditDisplayName = () => {
-    updateContactDetails({id: contact.id, displayName: displayName});
+    updateContactDetails({id: contact.id, displayName: displayName}).catch((error: Error) => {
+      console.error(error);
+    });
 
     if (contact?.conversations) {
       Object.keys(contact.conversations).forEach(conversationId => {
@@ -91,16 +87,16 @@ const ContactInformation = (props: ContactInformationProps) => {
       });
     }
 
-    setShowEditDisplayName(!saveEditDisplayName);
+    toggleEditDisplayName();
   };
 
-  const cancelEditDisplayName = () => {
+  const toggleEditDisplayName = useCallback(() => {
     setDisplayName(contact?.displayName);
     useAnimation(showEditDisplayName, setShowEditDisplayName, setFade, 400);
-  };
+  }, [showEditDisplayName, setShowEditDisplayName]);
 
   const editDisplayName = () => {
-    setShowEditDisplayName(!showEditDisplayName);
+    toggleEditDisplayName();
   };
 
   const getUpdatedInfo = () => {
@@ -125,15 +121,8 @@ const ContactInformation = (props: ContactInformationProps) => {
 
   return (
     <>
-      {(contact || conversationId) && contactInformationVisible && (
+      {(contact || conversationId) && (
         <div className={styles.content}>
-          <button
-            className={styles.contactsDetailsCollapseIcon}
-            onClick={() => setContactInformationVisible(!contactInformationVisible)}
-            data-cy={cyContactsCollapseIcon}
-          >
-            <CollapseRightArrowsIcon />
-          </button>
           {!isEditing ? (
             <button
               className={`${styles.editIcon} ${isContactDetailsExpanded ? styles.iconBlue : styles.iconGrey}`}
@@ -174,7 +163,7 @@ const ContactInformation = (props: ContactInformationProps) => {
                         dataCy={cyDisplayNameInput}
                       />
                       <div className={styles.displayNameButtons}>
-                        <button className={styles.cancelEdit} onClick={cancelEditDisplayName}>
+                        <button className={styles.cancelEdit} onClick={toggleEditDisplayName}>
                           <CloseIcon />
                         </button>
                         <button
diff --git a/frontend/inbox/src/pages/Contacts/ContactListItem/index.module.scss b/frontend/inbox/src/pages/Contacts/ContactListItem/index.module.scss
index 38a8592263..95695b9f5a 100644
--- a/frontend/inbox/src/pages/Contacts/ContactListItem/index.module.scss
+++ b/frontend/inbox/src/pages/Contacts/ContactListItem/index.module.scss
@@ -42,6 +42,9 @@
     height: 27px;
     width: 27px;
     margin-right: 2px;
+    opacity: 1;
+    transition: opacity 0.25s ease;
+
     &:hover {
       opacity: 0.3;
     }
diff --git a/frontend/inbox/src/pages/Contacts/index.module.scss b/frontend/inbox/src/pages/Contacts/index.module.scss
index 7b39e2f589..bf77e6e3b4 100644
--- a/frontend/inbox/src/pages/Contacts/index.module.scss
+++ b/frontend/inbox/src/pages/Contacts/index.module.scss
@@ -74,11 +74,3 @@
 .paginationContainer {
   margin: 0 32px 32px 32px;
 }
-
-.contactColumnAnimateIn {
-  animation: contactsInformationIn 300ms ease;
-}
-
-.contactColumnAnimateOut {
-  animation: contactsInformationOut 300ms ease;
-}
diff --git a/frontend/inbox/src/pages/Contacts/index.tsx b/frontend/inbox/src/pages/Contacts/index.tsx
index 2b6a1e225f..1899decf81 100644
--- a/frontend/inbox/src/pages/Contacts/index.tsx
+++ b/frontend/inbox/src/pages/Contacts/index.tsx
@@ -31,25 +31,28 @@ const Contacts = (props: ContactsProps) => {
   const [currentContact, setCurrentContact] = useState<Contact>();
   const [editModeOn, setEditModeOn] = useState(false);
   const [cancelEdit, setCancelEdit] = useState(false);
-  const [contactInformationVisible, setContactInformationVisible] = useState(false);
   const [currentVisibleContactId, setCurrentVisibleContactId] = useState('');
   const listPageSize = 9;
   const fetchNextPage = 5;
 
   useEffect(() => {
     setPageTitle('Contacts');
-    listContacts();
+    listContacts().catch((error: Error) => {
+      console.error(error);
+    });
   }, []);
 
   const pageSize = contacts.length >= listPageSize ? listPageSize : contacts.length;
   const [currentPage, setCurrentPage] = useState(1);
   const [lastPage, setLastPage] = useState(0);
+  const isFetchNext = lastPage % fetchNextPage === 0;
 
   const contactSorter = (a: Contact, b: Contact) => a.displayName?.localeCompare?.(b.displayName);
 
   const currentTableData = useMemo(() => {
-    const firstPageIndex = (currentPage - 1) * pageSize;
-    const lastPageIndex = firstPageIndex + pageSize;
+    const firstPageIndex = (currentPage - 1) * pageSize || 1;
+    const lastPageIndex = firstPageIndex + pageSize || listPageSize;
+
     return contacts.sort(contactSorter).slice(firstPageIndex, lastPageIndex);
   }, [currentPage, pageSize, contacts.length]);
 
@@ -61,13 +64,15 @@ const Contacts = (props: ContactsProps) => {
   }, [currentTableData]);
 
   useEffect(() => {
-    lastPage % fetchNextPage == 0 && listContacts();
+    isFetchNext &&
+      listContacts().catch((error: Error) => {
+        console.error(error);
+      });
   }, [currentPage]);
 
   const handleConversationId = (conversationId: string) => setConversationId(conversationId);
 
   const handleContact = (contact: Contact) => {
-    setContactInformationVisible(true);
     setCurrentContact(contact);
   };
 
@@ -86,7 +91,7 @@ const Contacts = (props: ContactsProps) => {
 
   return (
     <>
-      {contacts.length === 0 ? (
+      {currentTableData.length === 0 ? (
         <EmptyState />
       ) : (
         <>
@@ -129,15 +134,13 @@ const Contacts = (props: ContactsProps) => {
               </div>
             </div>
           </div>
-          <div className={contactInformationVisible ? styles.contactColumnAnimateIn : styles.contactColumnAnimateOut}>
+          <div>
             <ContactInformation
               conversationId={conversationId}
               contact={currentContact}
               editModeOn={editModeOn}
               setEditModeOn={handleEditMode}
               cancelEdit={cancelEdit}
-              setContactInformationVisible={setContactInformationVisible}
-              contactInformationVisible={contactInformationVisible}
             />
           </div>
         </>
diff --git a/frontend/inbox/src/pages/Inbox/MessageInput/index.tsx b/frontend/inbox/src/pages/Inbox/MessageInput/index.tsx
index 6fa9a28889..f17606e7bd 100644
--- a/frontend/inbox/src/pages/Inbox/MessageInput/index.tsx
+++ b/frontend/inbox/src/pages/Inbox/MessageInput/index.tsx
@@ -283,6 +283,9 @@ const MessageInput = (props: Props) => {
         case Source.viber:
           message.message = outboundMapper.getTextPayload(input);
           break;
+        case Source.whatsapp:
+          message.message = outboundMapper.getTextPayload(input);
+          break;
       }
 
       sendMessages(message).then(() => {
diff --git a/frontend/inbox/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx b/frontend/inbox/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
index 128271a113..b2b6778046 100644
--- a/frontend/inbox/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
+++ b/frontend/inbox/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
@@ -1,4 +1,4 @@
-import React, {FormEvent, useEffect, useState} from 'react';
+import React, {FormEvent, useCallback, useEffect, useState} from 'react';
 import {connect, ConnectedProps} from 'react-redux';
 import {Tag as TagModel, TagColor} from 'model';
 
@@ -89,7 +89,7 @@ const ConversationMetadata = (props: ConnectedProps<typeof connector>) => {
 
   const showAddTags = () => {
     setTagName('');
-    setShowTagsDialog(true);
+    toggleCloseDialog();
   };
 
   const addTag = (tag: TagModel) => {
@@ -138,7 +138,7 @@ const ConversationMetadata = (props: ConnectedProps<typeof connector>) => {
       createTag({name: tagName.trim(), color}).then((tag: TagModel) => {
         if (tag) {
           addTag(tag);
-          setShowTagsDialog(false);
+          toggleCloseDialog();
         }
       });
     }
@@ -150,18 +150,24 @@ const ConversationMetadata = (props: ConnectedProps<typeof connector>) => {
         updateConversationContactInfo(conversationId, displayName);
       });
     }
-    updateContactDetails({id: contactIdConvMetadata, displayName: displayName});
+    updateContactDetails({id: contactIdConvMetadata, displayName: displayName}).catch((error: Error) => {
+      console.error(error);
+    });
 
-    setShowEditDisplayName(!saveEditDisplayName);
+    toggleEditDisplayName();
   };
 
-  const cancelEditDisplayName = () => {
+  const toggleCloseDialog = useCallback(() => {
+    useAnimation(showTagsDialog, setShowTagsDialog, setFade, 400);
+  }, [showTagsDialog, setShowTagsDialog]);
+
+  const toggleEditDisplayName = useCallback(() => {
     setDisplayName(conversation.metadata.contact.displayName);
     useAnimation(showEditDisplayName, setShowEditDisplayName, setFade, 400);
-  };
+  }, [showEditDisplayName, setShowEditDisplayName]);
 
   const editDisplayName = () => {
-    setShowEditDisplayName(!showEditDisplayName);
+    toggleEditDisplayName();
   };
 
   const getUpdatedInfo = () => {
@@ -187,7 +193,7 @@ const ConversationMetadata = (props: ConnectedProps<typeof connector>) => {
 
     return (
       <div className={fade ? styles.fadeInAnimation : styles.fadeOutAnimation}>
-        <Dialog close={() => useAnimation(showTagsDialog, setShowTagsDialog, setFade, 400)}>
+        <Dialog close={toggleCloseDialog}>
           <form className={styles.addTags} onSubmit={submitForm}>
             <Input
               type="text"
@@ -291,7 +297,7 @@ const ConversationMetadata = (props: ConnectedProps<typeof connector>) => {
                       dataCy={cyDisplayNameInput}
                     />
                     <div className={styles.displayNameButtons}>
-                      <button className={styles.cancelEdit} onClick={cancelEditDisplayName}>
+                      <button className={styles.cancelEdit} onClick={toggleEditDisplayName}>
                         <CloseIcon />
                       </button>
                       <button
diff --git a/frontend/inbox/src/pages/Inbox/QuickFilter/Popup.tsx b/frontend/inbox/src/pages/Inbox/QuickFilter/Popup.tsx
index e07b2a9c03..b883b9453f 100644
--- a/frontend/inbox/src/pages/Inbox/QuickFilter/Popup.tsx
+++ b/frontend/inbox/src/pages/Inbox/QuickFilter/Popup.tsx
@@ -18,13 +18,15 @@ import {useTranslation} from 'react-i18next';
 
 function mapStateToProps(state: StateModel) {
   const channels: Channel[] = Object.values(allChannels(state));
+  const conversations = Object.values(state.data.conversations.all.items);
+
   return {
     user: state.data.user,
     filter: state.data.conversations.filtered.currentFilter,
     tags: state.data.tags.all,
     channels,
-    sources: channels.reduce<Set<string>>((acc, {source}) => {
-      acc.add(source);
+    sources: conversations.reduce<Set<string>>((acc, {channel}) => {
+      acc.add(channel.source);
       return acc;
     }, new Set<string>()),
   };
diff --git a/frontend/inbox/src/reducers/data/channels/index.ts b/frontend/inbox/src/reducers/data/channels/index.ts
index 8f8bfef120..405db1bcbb 100644
--- a/frontend/inbox/src/reducers/data/channels/index.ts
+++ b/frontend/inbox/src/reducers/data/channels/index.ts
@@ -49,6 +49,8 @@ const channelsReducer = (state = {}, action: Action): ChannelsState => {
           metadata: merge({}, state[action.payload.identifier]?.metadata, action.payload.metadata),
         },
       };
+    case getType(actions.setCurrentChannelsAction):
+      return action.payload.reduce(setChannel, {});
     case getType(actions.addChannelsAction):
       return action.payload.reduce(setChannel, state);
     case getType(actions.setChannelAction):
diff --git a/infrastructure/controller/pkg/cache/BUILD b/infrastructure/controller/pkg/cache/BUILD
deleted file mode 100644
index e6df26295c..0000000000
--- a/infrastructure/controller/pkg/cache/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "cache",
-    srcs = ["deployed_charts.go"],
-    importpath = "github.com/airyhq/airy/infrastructure/controller/pkg/cache",
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_github_mittwald_go_helm_client//:go-helm-client",
-        "@io_k8s_klog//:klog",
-    ],
-)
diff --git a/infrastructure/controller/pkg/cache/deployed_charts.go b/infrastructure/controller/pkg/cache/deployed_charts.go
deleted file mode 100644
index 2faa9d6270..0000000000
--- a/infrastructure/controller/pkg/cache/deployed_charts.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package cache
-
-import (
-	"sync"
-	"time"
-
-	helmCli "github.com/mittwald/go-helm-client"
-	"k8s.io/klog"
-)
-
-type DeployedCharts struct {
-	deployedCharts map[string]bool
-	cli            helmCli.Client
-	mu             sync.RWMutex
-	refresh        chan struct{}
-}
-
-func MustNewDeployedCharts(Cli helmCli.Client) *DeployedCharts {
-	dc := DeployedCharts{cli: Cli, deployedCharts: make(map[string]bool), refresh: make(chan struct{})}
-	go dc.refreshScheduler()
-	dc.RefreshDeployedCharts()
-	return &dc
-}
-
-func (s *DeployedCharts) refreshDeployedCharts() {
-	deployedReleases, err := s.cli.ListDeployedReleases()
-	if err != nil {
-		klog.Error(err.Error())
-		return
-	}
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	for _, r := range deployedReleases {
-		s.deployedCharts[r.Name] = true
-	}
-}
-
-func (s *DeployedCharts) refreshScheduler() {
-	for {
-		select {
-		case <-s.refresh:
-		case <-time.After(10 * time.Minute):
-		}
-		s.refreshDeployedCharts()
-	}
-}
-
-func (s *DeployedCharts) GetDeployedCharts() map[string]bool {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	d := make(map[string]bool, len(s.deployedCharts))
-	for k, v := range s.deployedCharts {
-		d[k] = v
-	}
-
-	return d
-}
-
-func (s *DeployedCharts) RefreshDeployedCharts() {
-	s.refresh <- struct{}{}
-}
diff --git a/infrastructure/controller/pkg/endpoints/BUILD b/infrastructure/controller/pkg/endpoints/BUILD
index 0fc12c18dd..fdcbf72037 100644
--- a/infrastructure/controller/pkg/endpoints/BUILD
+++ b/infrastructure/controller/pkg/endpoints/BUILD
@@ -18,7 +18,6 @@ go_library(
     importpath = "github.com/airyhq/airy/infrastructure/controller/pkg/endpoints",
     visibility = ["//visibility:public"],
     deps = [
-        "//infrastructure/controller/pkg/cache",
         "//lib/go/config",
         "//lib/go/k8s",
         "//lib/go/payloads",
diff --git a/infrastructure/controller/pkg/endpoints/components_install_uninstall.go b/infrastructure/controller/pkg/endpoints/components_install_uninstall.go
index d2d9ea84cc..f8cbf72119 100644
--- a/infrastructure/controller/pkg/endpoints/components_install_uninstall.go
+++ b/infrastructure/controller/pkg/endpoints/components_install_uninstall.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/airyhq/airy/infrastructure/controller/pkg/cache"
 	"github.com/airyhq/airy/lib/go/payloads"
 	helmCli "github.com/mittwald/go-helm-client"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -17,10 +16,9 @@ import (
 )
 
 type ComponentsInstallUninstall struct {
-	Cli            helmCli.Client
-	ClientSet      *kubernetes.Clientset
-	Namespace      string
-	DeployedCharts *cache.DeployedCharts
+	Cli       helmCli.Client
+	ClientSet *kubernetes.Clientset
+	Namespace string
 }
 
 func (s *ComponentsInstallUninstall) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -87,7 +85,6 @@ func (s *ComponentsInstallUninstall) ServeHTTP(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	s.DeployedCharts.RefreshDeployedCharts()
 	w.WriteHeader(http.StatusAccepted)
 }
 
diff --git a/infrastructure/controller/pkg/endpoints/components_list.go b/infrastructure/controller/pkg/endpoints/components_list.go
index 30a8a6afdd..e88ba22572 100644
--- a/infrastructure/controller/pkg/endpoints/components_list.go
+++ b/infrastructure/controller/pkg/endpoints/components_list.go
@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/airyhq/airy/infrastructure/controller/pkg/cache"
 	"github.com/airyhq/airy/lib/go/k8s"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/helm/cmd/helm/search"
@@ -14,10 +13,9 @@ import (
 )
 
 type ComponentsList struct {
-	ClientSet      *kubernetes.Clientset
-	Namespace      string
-	Index          *search.Index
-	DeployedCharts *cache.DeployedCharts
+	ClientSet *kubernetes.Clientset
+	Namespace string
+	Index     *search.Index
 }
 
 func (s *ComponentsList) ServeHTTP(w http.ResponseWriter, r *http.Request) {
diff --git a/infrastructure/controller/pkg/endpoints/components_update.go b/infrastructure/controller/pkg/endpoints/components_update.go
index 183ea66b4d..5f34a23ce8 100644
--- a/infrastructure/controller/pkg/endpoints/components_update.go
+++ b/infrastructure/controller/pkg/endpoints/components_update.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/airyhq/airy/infrastructure/controller/pkg/cache"
 	"github.com/airyhq/airy/lib/go/k8s"
 	"github.com/airyhq/airy/lib/go/payloads"
 	"k8s.io/client-go/kubernetes"
@@ -15,9 +14,8 @@ import (
 )
 
 type ComponentsUpdate struct {
-	DeployedCharts *cache.DeployedCharts
-	clientSet      *kubernetes.Clientset
-	namespace      string
+	clientSet *kubernetes.Clientset
+	namespace string
 }
 
 func (s *ComponentsUpdate) ServeHTTP(w http.ResponseWriter, r *http.Request) {
diff --git a/infrastructure/controller/pkg/endpoints/server.go b/infrastructure/controller/pkg/endpoints/server.go
index 11364ac4a1..27e24c426c 100644
--- a/infrastructure/controller/pkg/endpoints/server.go
+++ b/infrastructure/controller/pkg/endpoints/server.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/airyhq/airy/infrastructure/controller/pkg/cache"
 	"github.com/gorilla/mux"
 	helmCli "github.com/mittwald/go-helm-client"
 	"helm.sh/helm/v3/pkg/repo"
@@ -48,12 +47,11 @@ func Serve(clientSet *kubernetes.Clientset, namespace string, kubeConfig *rest.C
 	}
 
 	helmCli, helmIndex := mustGetHelmClientAndIndex(namespace, kubeConfig, clientSet, repoFilePath)
-	deployedCharts := cache.MustNewDeployedCharts(helmCli)
 
 	services := &Services{clientSet: clientSet, namespace: namespace}
 	r.Handle("/services", services)
 
-	componentsUpdate := &ComponentsUpdate{DeployedCharts: deployedCharts, clientSet: clientSet, namespace: namespace}
+	componentsUpdate := &ComponentsUpdate{clientSet: clientSet, namespace: namespace}
 	r.Handle("/components.update", componentsUpdate)
 
 	componentsDelete := &ComponentsDelete{clientSet: clientSet, namespace: namespace}
@@ -65,11 +63,11 @@ func Serve(clientSet *kubernetes.Clientset, namespace string, kubeConfig *rest.C
 	clusterUpdate := &ClusterUpdate{clientSet: clientSet, namespace: namespace}
 	r.Handle("/cluster.update", clusterUpdate)
 
-	componentsInstallUninstall := ComponentsInstallUninstall{DeployedCharts: deployedCharts, Cli: helmCli, ClientSet: clientSet, Namespace: namespace}
+	componentsInstallUninstall := ComponentsInstallUninstall{Cli: helmCli, ClientSet: clientSet, Namespace: namespace}
 	r.Handle("/components.install", &componentsInstallUninstall)
 	r.Handle("/components.uninstall", &componentsInstallUninstall)
 
-	componentsList := ComponentsList{DeployedCharts: deployedCharts, ClientSet: clientSet, Namespace: namespace, Index: helmIndex}
+	componentsList := ComponentsList{ClientSet: clientSet, Namespace: namespace, Index: helmIndex}
 	r.Handle("/components.list", &componentsList)
 
 	log.Fatal(http.ListenAndServe(":8080", r))
diff --git a/infrastructure/helm-chart/templates/components/ingress.yaml b/infrastructure/helm-chart/templates/components/ingress.yaml
index f25060dac4..2b5049d884 100644
--- a/infrastructure/helm-chart/templates/components/ingress.yaml
+++ b/infrastructure/helm-chart/templates/components/ingress.yaml
@@ -36,6 +36,13 @@ spec:
                 name: api-communication
                 port:
                   number: 80
+          - path: /conversations.markRead
+            pathType: Prefix
+            backend:
+              service:
+                name: unread-counter
+                port:
+                  number: 80
           - path: /contacts
             pathType: Prefix
             backend:
diff --git a/infrastructure/helm-chart/templates/components/unread-counter/configmap.yaml b/infrastructure/helm-chart/templates/components/unread-counter/configmap.yaml
new file mode 100644
index 0000000000..067a24a2be
--- /dev/null
+++ b/infrastructure/helm-chart/templates/components/unread-counter/configmap.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .Values.components.api.unread_counter.name }}"
+  labels:
+    core.airy.co/managed: "true"
+    core.airy.co/mandatory: "{{ .Values.components.api.communication.mandatory }}"
+    core.airy.co/component: "{{ .Values.components.api.unread_counter.name }}"
+  annotations:
+    core.airy.co/enabled: "{{ .Values.components.api.communication.enabled }}"
diff --git a/infrastructure/helm-chart/templates/components/unread-counter/deployment.yaml b/infrastructure/helm-chart/templates/components/unread-counter/deployment.yaml
new file mode 100644
index 0000000000..c8650099f1
--- /dev/null
+++ b/infrastructure/helm-chart/templates/components/unread-counter/deployment.yaml
@@ -0,0 +1,64 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "{{ .Values.components.api.unread_counter.name }}"
+  labels:
+    app: "{{ .Values.components.api.unread_counter.name }}"
+    type: api
+    core.airy.co/managed: "true"
+    core.airy.co/mandatory: "{{ .Values.components.api.unread_counter.mandatory }}"
+    core.airy.co/component: "{{ .Values.components.api.unread_counter.name }}"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: "{{ .Values.components.api.unread_counter.name }}"
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: "{{ .Values.components.api.unread_counter.name }}"
+        WorkerType: "{{ default "NodeGroup" .Values.global.workerType }}"
+    spec:
+      containers:
+      - name: app
+        image: "{{ .Values.global.containerRegistry}}/{{ .Values.components.api.unread_counter.image }}:{{ default .Chart.Version .Values.global.appImageTag }}"
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: security
+          - configMapRef:
+              name: kafka-config
+          - configMapRef:
+              name: "{{ .Values.components.api.unread_counter.name }}"
+        livenessProbe:
+          httpGet:
+            path: /actuator/health
+            port: 8080
+            httpHeaders:
+              - name: Health-Check
+                value: health-check
+          initialDelaySeconds: 120
+          periodSeconds: 10
+          failureThreshold: 3
+        resources:
+{{ toYaml .Values.components.api.unread_counter.resources | indent 10 }}
+      initContainers:
+      - name: wait
+        image: "{{ .Values.global.busyboxImage }}"
+        imagePullPolicy: IfNotPresent
+        command: [ "/bin/sh", "/opt/provisioning/wait-for-minimum-kafkas.sh" ]
+        envFrom:
+          - configMapRef:
+              name: kafka-config
+        volumeMounts:
+          - name: provisioning-scripts
+            mountPath: /opt/provisioning
+      volumes:
+        - name: provisioning-scripts
+          configMap:
+            name: provisioning-scripts
diff --git a/infrastructure/helm-chart/templates/components/unread-counter/service.yaml b/infrastructure/helm-chart/templates/components/unread-counter/service.yaml
new file mode 100644
index 0000000000..feb38bca7c
--- /dev/null
+++ b/infrastructure/helm-chart/templates/components/unread-counter/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.components.api.unread_counter.name }}
+  labels:
+    core.airy.co/prometheus: spring
+spec:
+  ports:
+    - name: web
+      port: 80
+      targetPort: 8080
+      protocol: TCP
+  type: NodePort
+  selector:
+    app: {{ .Values.components.api.unread_counter.name }}
diff --git a/infrastructure/helm-chart/templates/controller/configmap.yaml b/infrastructure/helm-chart/templates/controller/configmap.yaml
index d88ce77ec5..77e588b7ef 100644
--- a/infrastructure/helm-chart/templates/controller/configmap.yaml
+++ b/infrastructure/helm-chart/templates/controller/configmap.yaml
@@ -6,10 +6,7 @@ metadata:
 data:
   repositories.json: |
     {
-      "repositories": [
-        {
-          "name": "airy-core",
-          "url": "https://helm.airy.co"
-        }
-      ]
+      "repositories":
+      {{ toPrettyJson .Values.repositories | indent 6 }}
     }
+    
\ No newline at end of file
diff --git a/infrastructure/helm-chart/values.yaml b/infrastructure/helm-chart/values.yaml
index 7cc7a65cf8..b1f62c7d23 100644
--- a/infrastructure/helm-chart/values.yaml
+++ b/infrastructure/helm-chart/values.yaml
@@ -26,6 +26,11 @@ tools:
     enabled: true
 serviceAccount: airy-admin
 limitRange: false
+repositories:
+  - name: airy-core
+    url: "https://helm.airy.co"
+    username:
+    password:
 components:
   api:
     admin:
@@ -40,6 +45,12 @@ components:
       enabled: true
       image: api/communication
       resources: {}
+    unread_counter:
+      name: unread-counter
+      mandatory: true
+      enabled: true
+      image: components/unread-counter
+      resources: {}
     websocket:
       name: api-websocket
       mandatory: true
diff --git a/infrastructure/terraform/install/airy-core/outputs.tf b/infrastructure/terraform/install/airy-core/outputs.tf
index 7480452749..06a5e7c851 100644
--- a/infrastructure/terraform/install/airy-core/outputs.tf
+++ b/infrastructure/terraform/install/airy-core/outputs.tf
@@ -1,9 +1,14 @@
 output "API" {
   description = "The URL where the API and the UI can be reached"
-  value       = module.airy_core.loadbalancer
+  value       = module.airy_core.api_host
+}
+
+output "NGROK" {
+  description = "The URL where the API and the UI can be reached"
+  value       = "https://${module.airy_core.unique_id}.tunnel.airy.co"
 }
 
 output "Info" {
   description = "More information"
-  value       = "For more information about the AWS provider visit https://airy.co/docs/core/getting-started/installation/aws"
+  value       = "For more information visit https://airy.co/docs/core/getting-started/installation/introduction"
 }
diff --git a/infrastructure/terraform/install/gcp-gke/main.tf b/infrastructure/terraform/install/gcp-gke/main.tf
new file mode 100644
index 0000000000..053094faf4
--- /dev/null
+++ b/infrastructure/terraform/install/gcp-gke/main.tf
@@ -0,0 +1,6 @@
+module "gcp-gke" {
+  source = "github.com/airyhq/airy.git/infrastructure/terraform/modules/gcp-gke"
+
+  project_id                 = var.project_id
+  region                     = var.region
+}
diff --git a/infrastructure/terraform/install/gcp-gke/variables.tf b/infrastructure/terraform/install/gcp-gke/variables.tf
new file mode 100644
index 0000000000..45c07cba57
--- /dev/null
+++ b/infrastructure/terraform/install/gcp-gke/variables.tf
@@ -0,0 +1,8 @@
+variable "project_id" {
+  default     = "airy-core"
+  description = "The project is airy-core"
+}
+variable "region" {
+  default     = "us-central1"
+  description = "The region is us-central1"
+}
\ No newline at end of file
diff --git a/infrastructure/terraform/install/minikube/main.tf b/infrastructure/terraform/install/minikube/main.tf
new file mode 100644
index 0000000000..0393465d6e
--- /dev/null
+++ b/infrastructure/terraform/install/minikube/main.tf
@@ -0,0 +1,4 @@
+module "minikube" {
+  source = "github.com/airyhq/airy.git/infrastructure/terraform/modules/minikube"
+  kubeconfig_output_path = "../kube.conf"
+}
diff --git a/infrastructure/terraform/install/minikube/outputs.tf b/infrastructure/terraform/install/minikube/outputs.tf
new file mode 100644
index 0000000000..cc73a462a8
--- /dev/null
+++ b/infrastructure/terraform/install/minikube/outputs.tf
@@ -0,0 +1,3 @@
+output "kubeconfig_path" {
+  value = module.minikube.kubeconfig_path
+}
diff --git a/infrastructure/terraform/install/minikube/state.tf b/infrastructure/terraform/install/minikube/state.tf
new file mode 100644
index 0000000000..c89c917cc5
--- /dev/null
+++ b/infrastructure/terraform/install/minikube/state.tf
@@ -0,0 +1,5 @@
+terraform {
+  backend "local" {
+    path = "../kubernetes.tfstate"
+  }
+}
diff --git a/infrastructure/terraform/modules/core/main.tf b/infrastructure/terraform/modules/core/main.tf
index 08b8ddc3fa..d2c9a4e734 100644
--- a/infrastructure/terraform/modules/core/main.tf
+++ b/infrastructure/terraform/modules/core/main.tf
@@ -1,9 +1,3 @@
-resource "kubernetes_namespace" "core" {
-  metadata {
-    name = var.core_id
-  }
-}
-
 data "http" "core_version" {
   url = "https://raw.githubusercontent.com/airyhq/airy/main/VERSION"
 }
@@ -16,14 +10,16 @@ resource "helm_release" "airy_core" {
   name  = "airy-release"
   chart = "https://helm.airy.co/charts/airy-${local.core_version}.tgz"
 
-  timeout = "600"
+  timeout = var.timeout
   values = [
     var.values_yaml,
     var.resources_yaml,
     var.prerequisite_properties_yaml
   ]
 
-  namespace = var.namespace
+  namespace        = var.namespace
+  create_namespace = true
+  wait            = false
 
   set {
     name  = "global.appImageTag"
@@ -34,11 +30,6 @@ resource "helm_release" "airy_core" {
     name  = "ingress-controller.enabled"
     value = var.ingress_controller_enabled
   }
-
-  depends_on = [
-    kubernetes_namespace.core
-  ]
-
 }
 
 data "kubernetes_service" "ingress" {
@@ -50,3 +41,13 @@ data "kubernetes_service" "ingress" {
     helm_release.airy_core
   ]
 }
+
+data "kubernetes_config_map" "core_config" {
+  metadata {
+    name      = "core-config"
+    namespace = var.namespace
+  }
+  depends_on = [
+    helm_release.airy_core
+  ]
+}
diff --git a/infrastructure/terraform/modules/core/outputs.tf b/infrastructure/terraform/modules/core/outputs.tf
index 777d261b47..1c47774502 100644
--- a/infrastructure/terraform/modules/core/outputs.tf
+++ b/infrastructure/terraform/modules/core/outputs.tf
@@ -3,6 +3,21 @@ output "core_id" {
 }
 
 output "loadbalancer" {
-    description = "The URL for the load balancer of the cluster. Used to access the UI via the browser"
-    value       = data.kubernetes_service.ingress.status.0.load_balancer.0.ingress.0.hostname
+  description = "The URL for the load balancer of the cluster. Used to access the UI via the browser"
+  value       = try(data.kubernetes_service.ingress.status.0.load_balancer.0.ingress.0.hostname,data.kubernetes_config_map.core_config.data.HOST)
+}
+
+output "api_host" {
+  description = "The URL of the API and the UI"
+  value       = try(data.kubernetes_config_map.core_config.data.API_HOST,data.kubernetes_config_map.core_config.data.HOST)
+}
+
+output "version" {
+  description = "The URL of the API and the UI"
+  value       = data.kubernetes_config_map.core_config.data.APP_IMAGE_TAG
+}
+
+output "unique_id" {
+  description = "Unique ID used for the NGrok public tunnel"
+  value       = data.kubernetes_config_map.core_config.data.CORE_ID
 }
diff --git a/infrastructure/terraform/modules/core/variables.tf b/infrastructure/terraform/modules/core/variables.tf
index 60d2edb9a1..2b2762a258 100644
--- a/infrastructure/terraform/modules/core/variables.tf
+++ b/infrastructure/terraform/modules/core/variables.tf
@@ -15,10 +15,12 @@ variable "namespace" {
 
 variable "values_yaml" {
   description = "The helm values overrides"
+  type        = string
 }
 
 variable "resources_yaml" {
   description = "Resource requests and limits for the components"
+  default     = ""
 }
 
 variable "prerequisite_properties_yaml" {
@@ -28,12 +30,15 @@ variable "prerequisite_properties_yaml" {
 
 variable "core_version" {
   description = "Version of the Airy Core instance"
-  type        = string
   default     = ""
 }
 
 variable "ingress_controller_enabled" {
   description = "Whether to create the NGinx ingress controller"
-  type        = string
   default     = "true"
 }
+
+variable "timeout" {
+  description = "Timeout for the Helm installation"
+  default     = 600
+}
diff --git a/infrastructure/terraform/modules/gcp-gke/main.tf b/infrastructure/terraform/modules/gcp-gke/main.tf
new file mode 100644
index 0000000000..551e8b1539
--- /dev/null
+++ b/infrastructure/terraform/modules/gcp-gke/main.tf
@@ -0,0 +1,62 @@
+provider "google" {
+  project = var.project_id
+  region    = var.region
+}
+
+resource "google_compute_network" "vpc" {
+  name                    = var.vpc_name
+}
+
+resource "google_container_cluster" "gke_core" {
+  name     = "${var.project_id}-gke"
+  location = var.region
+  remove_default_node_pool = true
+  initial_node_count       = 1
+  network    = google_compute_network.vpc.name
+}
+
+resource "google_container_node_pool" "gke_core_nodes" {
+  name       = "${google_container_cluster.gke_core.name}-node-pool"
+  location   = var.region
+  cluster    = google_container_cluster.gke_core.name
+  node_count = var.gke_num_nodes
+  node_locations = var.gke_node_locations
+
+  node_config {
+    preemptible  = true
+    machine_type = var.gke_instance_type
+
+    oauth_scopes = [
+      "https://www.googleapis.com/auth/logging.write",
+      "https://www.googleapis.com/auth/monitoring",
+    ]
+
+    tags         = ["gke-node", "${var.project_id}-gke"]
+    metadata = {
+      disable-legacy-endpoints = "true"
+    }
+    labels = {
+      env = var.project_id
+    }
+
+  }
+
+  depends_on = [resource.google_container_cluster.gke_core]
+}
+
+module "gke_auth" {
+  source = "terraform-google-modules/kubernetes-engine/google//modules/auth"
+
+  project_id   = var.project_id
+  location     = google_container_cluster.gke_core.location
+  cluster_name = google_container_cluster.gke_core.name
+
+  depends_on = [
+    resource.google_container_cluster.gke_core
+  ]
+}
+
+resource "local_file" "kubeconfig" {
+  content  = module.gke_auth.kubeconfig_raw
+  filename = var.kubeconfig_output_path
+}
\ No newline at end of file
diff --git a/infrastructure/terraform/modules/gcp-gke/outputs.tf b/infrastructure/terraform/modules/gcp-gke/outputs.tf
new file mode 100644
index 0000000000..a956e386cb
--- /dev/null
+++ b/infrastructure/terraform/modules/gcp-gke/outputs.tf
@@ -0,0 +1,8 @@
+output "kubernetes_cluster_name" {
+  value       = google_container_cluster.gke_core.name
+  description = "GKE Cluster Name"
+}
+output "kubeconfig_raw" {
+  sensitive = true
+  value = module.gke_auth.kubeconfig_raw
+}
diff --git a/infrastructure/terraform/modules/gcp-gke/variables.tf b/infrastructure/terraform/modules/gcp-gke/variables.tf
new file mode 100644
index 0000000000..ef94ab8119
--- /dev/null
+++ b/infrastructure/terraform/modules/gcp-gke/variables.tf
@@ -0,0 +1,28 @@
+variable "project_id" {
+  default     = "airy-core"
+  description = "The project defined in gcloud config is airy-core"
+}
+variable "region" {
+  default     = "us-central1"
+  description = "The region defined in gcloud config is us-central1"
+}
+variable "gke_num_nodes" {
+  default     = 1
+  description = "Number of gke nodes"
+}
+variable "gke_node_locations" {
+  default     = []
+  description = "List of zones for the nodes in the node pool"
+}
+variable "vpc_name" {
+  default     = "airy-core-vpc"
+  description = "The name of the created VPC"
+}
+variable "kubeconfig_output_path" {
+  default     = "../kube.conf"
+  description = "The location of the kubeconfig file"
+}
+variable "gke_instance_type" {
+  default     = "n1-standard-2"
+  description = "The type of the instances in the node pool"
+}
diff --git a/infrastructure/terraform/modules/minikube/main.tf b/infrastructure/terraform/modules/minikube/main.tf
new file mode 100644
index 0000000000..92a2234b51
--- /dev/null
+++ b/infrastructure/terraform/modules/minikube/main.tf
@@ -0,0 +1,19 @@
+resource "null_resource" "minikube" {
+  triggers = {
+    profile         = var.profile
+    driver          = var.driver
+    cpus            = var.cpus
+    memory          = var.memory
+    nodeport        = var.nodeport
+    kubeconfig_output_path = var.kubeconfig_output_path
+  }
+
+  provisioner "local-exec" {
+    command = "KUBECONFIG=${self.triggers.kubeconfig_output_path} minikube -p ${self.triggers.profile} start --driver=${self.triggers.driver} --cpus=${self.triggers.cpus} --memory=${self.triggers.memory} --container-runtime=containerd --ports=${self.triggers.nodeport}:${self.triggers.nodeport} --extra-config=apiserver.service-node-port-range=1-65535"
+  }
+
+  provisioner "local-exec" {
+    when    = destroy
+    command = "minikube -p ${self.triggers.profile} delete"
+  }
+}
diff --git a/infrastructure/terraform/modules/minikube/outputs.tf b/infrastructure/terraform/modules/minikube/outputs.tf
new file mode 100644
index 0000000000..ede5fc5c10
--- /dev/null
+++ b/infrastructure/terraform/modules/minikube/outputs.tf
@@ -0,0 +1,4 @@
+output "kubeconfig_path" {
+    description = "The location of the KUBECONFIG file that was used"
+    value       = var.kubeconfig_output_path
+}
diff --git a/infrastructure/terraform/modules/minikube/variables.tf b/infrastructure/terraform/modules/minikube/variables.tf
new file mode 100644
index 0000000000..a52fa05767
--- /dev/null
+++ b/infrastructure/terraform/modules/minikube/variables.tf
@@ -0,0 +1,28 @@
+variable "profile" {
+  description = "The profile to be used for Minikube"
+  default     = "airy-core"
+}
+
+variable "driver" {
+  description = "The driver to be used for Minikube"
+  default     = "docker"
+}
+
+variable "cpus" {
+  description = "Number of CPUs Minikube should use"
+  default     = 3
+}
+
+variable "memory" {
+  description = "Amount of memory Minikube should use"
+  default     = 7168
+}
+
+variable "nodeport" {
+  description = "The port on which the ingress controller, the API and the web UI will be reached"
+  default     = 80
+}
+
+variable "kubeconfig_output_path" {
+  description = "The path where the KUBECONFIG file will be written"
+}
diff --git a/integration/support/createChatPluginConversation.ts b/integration/support/createChatPluginConversation.ts
index 35ccb3e065..d38f07a984 100644
--- a/integration/support/createChatPluginConversation.ts
+++ b/integration/support/createChatPluginConversation.ts
@@ -1,17 +1,17 @@
 import {
-  cyChannelsChatPluginAddButton,
+  cyAddChannelButton,
   cyConnectorsAddNewButton,
   cyChannelsChatPluginFormNameInput,
   cyChannelsChatPluginFormSubmitButton,
   cyChannelsChatPluginList,
-  cyChannelsFormBackButton,
   cyChannelCreatedChatPluginCloseButton,
 } from 'handles';
 import {cyInputbarButton, cyInputbarTextarea} from 'chat-plugin-handles';
 
 export const connectChatPluginConnector = (): void => {
-  cy.get(`[data-cy=${cyChannelsChatPluginAddButton}]`).click();
-  cy.get(`[data-cy=${cyConnectorsAddNewButton}]`).first().click({force: true});
+  cy.get(`[data-cy=${cyAddChannelButton}]`).click();
+  cy.wait(500);
+  cy.get(`[data-cy=${cyConnectorsAddNewButton}]`).click({force: true});
   cy.wait(500);
   cy.get(`[data-cy=${cyChannelsChatPluginFormNameInput}]`).type(Cypress.env('chatPluginName'), {force: true});
   cy.get(`[data-cy=${cyChannelsChatPluginFormSubmitButton}]`).click();
@@ -23,7 +23,6 @@ export const createChatPluginConversation = (): void => {
   cy.wait(500);
   cy.connectChatPluginConnector();
 
-  cy.get(`[data-cy=${cyChannelsFormBackButton}]`).click();
   cy.wait(500);
   cy.get(`[data-cy=${cyChannelsChatPluginList}]`).filter(`:contains("${Cypress.env('chatPluginName')}")`);
 
diff --git a/integration/ui/connect_chatplugin.spec.ts b/integration/ui/connect_chatplugin.spec.ts
index ab7a23c2f1..e54ae637f5 100644
--- a/integration/ui/connect_chatplugin.spec.ts
+++ b/integration/ui/connect_chatplugin.spec.ts
@@ -1,4 +1,4 @@
-import {cyChannelsFormBackButton, cyChannelsChatPluginList} from 'handles';
+import {cyChannelsChatPluginList} from 'handles';
 
 declare global {
   namespace Cypress {
@@ -20,7 +20,7 @@ describe('Connect chatplugin channel', () => {
     cy.connectChatPluginConnector();
 
     cy.url().should('include', '/control-center/connectors');
-    cy.get(`[data-cy=${cyChannelsFormBackButton}]`).click();
+
     cy.get(`[data-cy=${cyChannelsChatPluginList}]`).filter(`:contains("${Cypress.env('chatPluginName')}")`);
   });
 });
diff --git a/integration/ui/list_contacts_page.spec.ts b/integration/ui/list_contacts_page.spec.ts
index 08199bc190..99d2c06144 100644
--- a/integration/ui/list_contacts_page.spec.ts
+++ b/integration/ui/list_contacts_page.spec.ts
@@ -1,4 +1,4 @@
-import {cyContactItem, cyContactEmail, cyContactsCollapseIcon} from 'handles';
+import {cyContactItem, cyContactEmail} from 'handles';
 
 describe('Contacts page lists contacts and allow to edit contacts details and display name', () => {
   beforeEach(() => {
@@ -26,9 +26,6 @@ describe('Contacts page lists contacts and allow to edit contacts details and di
 
     cy.get(`[data-cy=${cyContactEmail}]`).should('be.visible');
 
-    cy.get(`[data-cy=${cyContactsCollapseIcon}]`).click();
-    cy.wait(500);
-
     cy.get(`[data-cy=${cyContactEmail}]`).should('not.exist');
   });
 });
diff --git a/lib/go/tools/BUILD b/lib/go/tools/BUILD
new file mode 100644
index 0000000000..0e40b57219
--- /dev/null
+++ b/lib/go/tools/BUILD
@@ -0,0 +1,12 @@
+load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+# gazelle:prefix github.com/airyhq/airy/lib/go/tools
+
+go_library(
+    name = "tools",
+    srcs = ["tools.go"],
+    importpath = "github.com/airyhq/airy/lib/go/tools",
+    visibility = ["//visibility:public"],
+)
+
+check_pkg(name = "buildifier")
diff --git a/lib/go/tools/tools.go b/lib/go/tools/tools.go
new file mode 100644
index 0000000000..28aa54e096
--- /dev/null
+++ b/lib/go/tools/tools.go
@@ -0,0 +1,17 @@
+package tools
+
+import (
+	"math/rand"
+	"time"
+)
+
+var letters = []rune("abcdefghijklmnopqrstuvwxyz")
+
+func RandString(n int) string {
+	rand.Seed(time.Now().UnixNano())
+	b := make([]rune, n)
+	for i := range b {
+		b[i] = letters[rand.Intn(len(letters))]
+	}
+	return string(b)
+}
diff --git a/lib/java/crypto/src/main/java/co/airy/crypto/Signature.java b/lib/java/crypto/src/main/java/co/airy/crypto/Signature.java
index f8035def66..98f4e9fd55 100644
--- a/lib/java/crypto/src/main/java/co/airy/crypto/Signature.java
+++ b/lib/java/crypto/src/main/java/co/airy/crypto/Signature.java
@@ -2,7 +2,9 @@
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
+import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
 public class Signature {
@@ -27,11 +29,25 @@ public static String getSignature(String key, String content) throws InvalidKeyE
         SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes(), "HmacSHA256");
         mac.init(secretKeySpec);
         byte[] hmac = mac.doFinal(content.getBytes());
+        return byteToHex(hmac);
+    }
+
+    public static String byteToHex(byte[] payload) {
         StringBuilder builder = new StringBuilder();
-        for (byte b : hmac) {
+        for (byte b : payload) {
             // TODO This is slow compared to the DataTypeConverter implementation
             builder.append(String.format("%02X", b).toLowerCase());
         }
         return builder.toString();
     }
+
+    public static String getSha1(String content) {
+        try {
+            final MessageDigest digest = MessageDigest.getInstance("SHA-1");
+            digest.update(content.getBytes(StandardCharsets.UTF_8));
+            return byteToHex(digest.digest());
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/lib/typescript/assets/images/icons/amazons3Logo.svg b/lib/typescript/assets/images/icons/amazons3Logo.svg
new file mode 100644
index 0000000000..e1328214b4
--- /dev/null
+++ b/lib/typescript/assets/images/icons/amazons3Logo.svg
@@ -0,0 +1 @@
+<svg viewBox="-27 0 310 310" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M20.624 53.686L0 64v181.02l20.624 10.254.124-.149V53.828l-.124-.142" fill="#8C3123"/><path d="M131 229L20.624 255.274V53.686L131 79.387V229" fill="#E05243"/><path d="M81.178 187.866l46.818 5.96.294-.678.263-76.77-.557-.6-46.818 5.874v66.214" fill="#8C3123"/><path d="M127.996 229.295l107.371 26.035.169-.269-.003-201.195-.17-.18-107.367 25.996v149.613" fill="#8C3123"/><path d="M174.827 187.866l-46.831 5.96v-78.048l46.831 5.874v66.214" fill="#E05243"/><path d="M174.827 89.631l-46.831 8.535-46.818-8.535 46.759-12.256 46.89 12.256" fill="#5E1F18"/><path d="M174.827 219.801l-46.831-8.591-46.818 8.591 46.761 13.053 46.888-13.053" fill="#F2B0A9"/><path d="M81.178 89.631l46.818-11.586.379-.117V.313L127.996 0 81.178 23.413v66.218" fill="#8C3123"/><path d="M174.827 89.631l-46.831-11.586V0l46.831 23.413v66.218" fill="#E05243"/><path d="M127.996 309.428l-46.823-23.405v-66.217l46.823 11.582.689.783-.187 75.906-.502 1.351" fill="#8C3123"/><path d="M127.996 309.428l46.827-23.405v-66.217l-46.827 11.582v78.04M235.367 53.686L256 64v181.02l-20.633 10.31V53.686" fill="#E05243"/></svg>
\ No newline at end of file
diff --git a/lib/typescript/assets/images/icons/filterAlt.svg b/lib/typescript/assets/images/icons/filterAlt.svg
index 9582c9beca..61bfaf93f7 100644
--- a/lib/typescript/assets/images/icons/filterAlt.svg
+++ b/lib/typescript/assets/images/icons/filterAlt.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path fill="gray" d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-1a9 9 0 1 0 0-18 9 9 0 0 0 0 18zM6.5 10a.5.5 0 0 1 0-1h11a.5.5 0 1 1 0 1h-11zm2 3a.5.5 0 1 1 0-1h7a.5.5 0 1 1 0 1h-7zm2 3a.5.5 0 1 1 0-1h3a.5.5 0 1 1 0 1h-3z"/>
+    <path fill="currentColor" d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-1a9 9 0 1 0 0-18 9 9 0 0 0 0 18zM6.5 10a.5.5 0 0 1 0-1h11a.5.5 0 1 1 0 1h-11zm2 3a.5.5 0 1 1 0-1h7a.5.5 0 1 1 0 1h-7zm2 3a.5.5 0 1 1 0-1h3a.5.5 0 1 1 0 1h-3z"/>
 </svg>
\ No newline at end of file
diff --git a/lib/typescript/assets/images/icons/ibmWatsonAssistantLogo.svg b/lib/typescript/assets/images/icons/ibmWatsonAssistantLogo.svg
new file mode 100644
index 0000000000..0fd197572e
--- /dev/null
+++ b/lib/typescript/assets/images/icons/ibmWatsonAssistantLogo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-149.9988 -100.0005 1299.9896 600.003"><clipPath id="b"><path d="M0-1v83h55.937v236H1.523v82h194.65v-82h-55.938V82h54.414V-1zm554.02 1v82h55.938v236h-54.414v82h138.71V171.84l82.656 228.08 1.68.04 81.172-228.12V400h140.23v-82h-55.938V82h54.415V0h-156.33l-64.726 182.89L711.866 0z"/><path d="M222.23 0v82h55.937v130h215.31v-24.928s18.011-14.042 23.75-27.367l11.523-25.855s5.352-14.472 5.352-27.405l-2.305-25.855s-3.616-21.063-9.922-27.328l-22.266-25.895S471.276 0 433.75 0zm140.23 82h81.992v76H362.46z" id="a"/><use height="100%" width="100%" xlink:href="#a" transform="matrix(1 0 0 -1 0 400)"/></clipPath><path transform="translate(0 .002)" clip-path="url(#b)" d="M0 13.683h1030v53.232H0m0 53.232h975v53.242H0v53.222h975v53.222H0m0 53.242h1030v53.242H0" stroke-width="27.37" stroke="#1f70c1" fill="none"/></svg>
\ No newline at end of file
diff --git a/lib/typescript/assets/images/icons/productList.svg b/lib/typescript/assets/images/icons/productList.svg
new file mode 100644
index 0000000000..be185a9171
--- /dev/null
+++ b/lib/typescript/assets/images/icons/productList.svg
@@ -0,0 +1,5 @@
+<svg class="svg-icon" fill="currentColor" style="width:1em;height:1em;vertical-align:middle;overflow:hidden"
+    viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M887.212 264.644H320.084c-29.827 0-54.013-23.896-54.013-53.723s24.186-53.724 54.013-53.724H887.21c29.827 0 54.012 23.896 54.012 53.724s-24.184 53.723-54.01 53.723zm0 297.782H320.084c-29.827 0-54.013-24.408-54.013-54.235 0-29.828 24.186-54.235 54.013-54.235H887.21c29.827 0 54.012 24.407 54.012 54.235.001 29.828-24.184 54.235-54.01 54.235zm0 296.76H320.084c-29.827 0-54.013-24.409-54.013-54.236s24.186-54.235 54.013-54.235H887.21c29.827 0 54.012 24.408 54.012 54.235s-24.184 54.235-54.01 54.235zM153.565 257.943h-47.261c-13.056 0-23.63-10.602-23.63-23.656v-47.235c0-13.08 10.574-23.63 23.63-23.63h47.261c13.054 0 23.63 10.55 23.63 23.63v47.235c0 13.053-10.576 23.656-23.63 23.656zm0 594.132h-47.261c-13.056 0-23.63-10.6-23.63-23.655v-47.234c0-13.081 10.574-23.631 23.63-23.631h47.261c13.054 0 23.63 10.55 23.63 23.63v47.235c0 13.055-10.576 23.655-23.63 23.655zm0-310.569h-47.261c-13.056 0-23.63-10.601-23.63-23.656v-47.235c0-13.08 10.574-23.63 23.63-23.63h47.261c13.054 0 23.63 10.55 23.63 23.63v47.235c0 13.055-10.576 23.656-23.63 23.656z" />
+</svg>
\ No newline at end of file
diff --git a/lib/typescript/assets/scss/colors.scss b/lib/typescript/assets/scss/colors.scss
index 1d4e7e3499..8489f3dc59 100644
--- a/lib/typescript/assets/scss/colors.scss
+++ b/lib/typescript/assets/scss/colors.scss
@@ -21,6 +21,7 @@
   --color-airy-message-text-inbound: #000000;
 
   //colors that do not change with darkmode
+  --color-template-border-gray: #ccc;
   --color-disable-status-config: #737373;
   --color-dark-elements-gray: #98a4ab;
   --color-icons-gray: #a0abb2;
@@ -41,6 +42,7 @@
   --color-red-alert: #d51548;
   --color-red-alert-pressed: #a2002b;
   --color-red-info: #ee336c;
+  --color-notify-me: #a30d8b;
   --color-accent-magenta: #f7147d;
   --color-error-background: #fae6e9;
   --color-highlight-yellow: #fbbd54;
diff --git a/lib/typescript/assets/scss/fonts.scss b/lib/typescript/assets/scss/fonts.scss
index 69a1c8c0c9..cae1018c75 100644
--- a/lib/typescript/assets/scss/fonts.scss
+++ b/lib/typescript/assets/scss/fonts.scss
@@ -8,6 +8,13 @@
   line-height: 13.2px;
 }
 
+@mixin font-xs-bold {
+  font-family: 'Lato', sans-serif;
+  font-size: 11px;
+  line-height: 13.2px;
+  font-weight: bold;
+}
+
 @mixin font-s {
   font-family: 'Lato', sans-serif;
   font-size: 13px;
diff --git a/lib/typescript/components/alerts/NotificationComponent/index.tsx b/lib/typescript/components/alerts/NotificationComponent/index.tsx
index 4791201282..41fdae05d1 100644
--- a/lib/typescript/components/alerts/NotificationComponent/index.tsx
+++ b/lib/typescript/components/alerts/NotificationComponent/index.tsx
@@ -15,11 +15,13 @@ type NotificationProps = {
   info?: boolean;
   text: string;
   setShowFalse: Dispatch<SetStateAction<NotificationModel>>;
+  forceClose?: boolean;
+  setForceClose?: Dispatch<SetStateAction<boolean>>;
   duration?: number; //in ms
 };
 
 export const NotificationComponent = (props: NotificationProps) => {
-  const {type, show, successful, info, text, setShowFalse, duration} = props;
+  const {type, show, successful, info, text, setShowFalse, forceClose, setForceClose, duration} = props;
   const defaultDuration = 5000;
   const [close, setClose] = useState(false);
   const [usedDuration, setUsedDuration] = useState(duration || defaultDuration);
@@ -52,19 +54,20 @@ export const NotificationComponent = (props: NotificationProps) => {
   }, []);
 
   useEffect(() => {
-    close &&
+    (close || forceClose) &&
       setTimeout(() => {
         setShowFalse({show: false});
         setClose(false);
+        forceClose && setForceClose(false);
       }, duration / 2 || defaultDuration / 2);
-  }, [close]);
+  }, [close, forceClose]);
 
   return (
     <div
       ref={notificationRef}
       className={`${styles.notificationContainer} ${
         show && animType === NotificationType.fade ? styles.translateYAnimFade : styles.translateYAnimSticky
-      } ${close && styles.translateYAnimStickyClose}`}
+      } ${(close || forceClose) && styles.translateYAnimStickyClose}`}
       style={{
         background: info ? colorAiryBlue : successful ? colorSoftGreen : colorRedAlert,
         animationDuration: `${usedDuration}ms`,
@@ -72,7 +75,7 @@ export const NotificationComponent = (props: NotificationProps) => {
       }}
     >
       <div className={styles.contentContainer}>
-        <span className={styles.notificationText} style={type === NotificationType.sticky ? {marginRight: '16px'} : {}}>
+        <span className={styles.notificationText} style={type === NotificationType.sticky ? {marginRight: '24px'} : {}}>
           {text}
         </span>
         {type === NotificationType.sticky && (
diff --git a/lib/typescript/components/cta/Button/index.tsx b/lib/typescript/components/cta/Button/index.tsx
index 9fca9c1c6b..6c9201938a 100644
--- a/lib/typescript/components/cta/Button/index.tsx
+++ b/lib/typescript/components/cta/Button/index.tsx
@@ -11,7 +11,10 @@ type styleVariantType =
   | 'warning'
   | 'link'
   | 'text'
-  | 'green';
+  | 'green'
+  | 'greenOutline'
+  | 'purple'
+  | 'purpleOutline';
 
 type ButtonProps = {
   children: ReactNode;
@@ -44,6 +47,12 @@ export const Button = ({
         return styles.extraSmallButton;
       case 'green':
         return styles.greenButton;
+      case 'greenOutline':
+        return styles.greenOutlineButton;
+      case 'purple':
+        return styles.purpleButton;
+      case 'purpleOutline':
+        return styles.purpleOutlineButton;
       case 'small':
         return styles.smallButton;
       case 'outline':
diff --git a/lib/typescript/components/cta/Button/style.module.scss b/lib/typescript/components/cta/Button/style.module.scss
index c9d5c1f68f..b00fa3a485 100644
--- a/lib/typescript/components/cta/Button/style.module.scss
+++ b/lib/typescript/components/cta/Button/style.module.scss
@@ -58,6 +58,57 @@
   }
 }
 
+.greenOutlineButton {
+  @extend .extraSmallButton;
+  background-color: transparent;
+  border: 1px solid var(--color-soft-green);
+  color: var(--color-soft-green);
+
+  &:hover {
+    background-color: rgba($color: #0da36b, $alpha: 0.2);
+    border: 1px solid #0da36b;
+  }
+
+  &:active {
+    background-color: var(--color-green-pressed);
+    color: var(--color-background-white);
+  }
+}
+
+.purpleButton {
+  @extend .extraSmallButton;
+  background-color: rgba($color: #a30d8b, $alpha: 0.2);
+  border: 1px solid var(--color-notify-me);
+  color: var(--color-notify-me);
+
+  &:hover {
+    background: var(--color-notify-me);
+    color: var(--color-background-white);
+  }
+
+  &:active {
+    background-color: var(--color-notify-me);
+    color: var(--color-background-white);
+  }
+}
+
+.purpleOutlineButton {
+  @extend .extraSmallButton;
+  background-color: transparent;
+  border: 1px solid var(--color-notify-me);
+  color: var(--color-notify-me);
+
+  &:hover {
+    background: var(--color-notify-me);
+    color: var(--color-background-white);
+  }
+
+  &:active {
+    background-color: var(--color-notify-me);
+    color: var(--color-background-white);
+  }
+}
+
 .smallButton {
   @extend .button;
   @include font-base;
diff --git a/lib/typescript/components/cta/SmartButton/index.module.scss b/lib/typescript/components/cta/SmartButton/index.module.scss
index e59ca5e34e..17fa988cb4 100644
--- a/lib/typescript/components/cta/SmartButton/index.module.scss
+++ b/lib/typescript/components/cta/SmartButton/index.module.scss
@@ -58,6 +58,23 @@
   }
 }
 
+.greenOutlineButton {
+  @extend .extraSmallButton;
+  background-color: transparent;
+  border: 1px solid var(--color-soft-green);
+  color: var(--color-soft-green);
+
+  &:hover {
+    background-color: rgba($color: #0da36b, $alpha: 0.2);
+    border: 1px solid #0da36b;
+  }
+
+  &:active {
+    background-color: var(--color-green-pressed);
+    color: var(--color-background-white);
+  }
+}
+
 .smallButton {
   @extend .button;
   @include font-base;
@@ -98,6 +115,70 @@
   padding: 3px 16px;
 }
 
+.greenButton {
+  @extend .extraSmallButton;
+  background-color: var(--color-soft-green);
+
+  &:hover {
+    background-color: var(--color-green-pressed);
+  }
+
+  &:active {
+    background-color: var(--color-green-pressed);
+  }
+}
+
+.greenOutlineButton {
+  @extend .extraSmallButton;
+  background-color: transparent;
+  border: 1px solid var(--color-soft-green);
+  color: var(--color-soft-green);
+
+  &:hover {
+    background-color: rgba($color: #0da36b, $alpha: 0.2);
+    border: 1px solid #0da36b;
+  }
+
+  &:active {
+    background-color: var(--color-green-pressed);
+    color: var(--color-background-white);
+  }
+}
+
+.purpleButton {
+  @extend .extraSmallButton;
+  background-color: rgba($color: #a30d8b, $alpha: 0.2);
+  border: 1px solid var(--color-notify-me);
+  color: var(--color-notify-me);
+
+  &:hover {
+    background: var(--color-notify-me);
+    color: var(--color-background-white);
+  }
+
+  &:active {
+    background-color: var(--color-notify-me);
+    color: var(--color-background-white);
+  }
+}
+
+.purpleOutlineButton {
+  @extend .extraSmallButton;
+  background-color: transparent;
+  border: 1px solid var(--color-notify-me);
+  color: var(--color-notify-me);
+
+  &:hover {
+    background: var(--color-notify-me);
+    color: var(--color-background-white);
+  }
+
+  &:active {
+    background-color: var(--color-notify-me);
+    color: var(--color-background-white);
+  }
+}
+
 .linkButton {
   @include font-base;
   display: flex;
diff --git a/lib/typescript/components/cta/SmartButton/index.tsx b/lib/typescript/components/cta/SmartButton/index.tsx
index 17f778443c..85e971b6a5 100644
--- a/lib/typescript/components/cta/SmartButton/index.tsx
+++ b/lib/typescript/components/cta/SmartButton/index.tsx
@@ -12,7 +12,10 @@ type styleVariantType =
   | 'warning'
   | 'link'
   | 'text'
-  | 'green';
+  | 'green'
+  | 'greenOutline'
+  | 'purple'
+  | 'purpleOutline';
 
 type ButtonProps = {
   title: string;
@@ -58,6 +61,12 @@ export const SmartButton = ({
         return styles.extraSmallButton;
       case 'green':
         return styles.greenButton;
+      case 'greenOutline':
+        return styles.greenOutlineButton;
+      case 'purple':
+        return styles.purpleButton;
+      case 'purpleOutline':
+        return styles.purpleOutlineButton;
       case 'small':
         return styles.smallButton;
       case 'outline':
diff --git a/lib/typescript/components/inputs/Input/index.tsx b/lib/typescript/components/inputs/Input/index.tsx
index 34b2890be1..759857697f 100644
--- a/lib/typescript/components/inputs/Input/index.tsx
+++ b/lib/typescript/components/inputs/Input/index.tsx
@@ -263,6 +263,7 @@ class InputComponent extends Component<InputProps, IState> {
       label,
       showLabelIcon,
       tooltipText,
+      tooltipStyle,
       hideLabel,
       name,
       value,
@@ -314,7 +315,7 @@ class InputComponent extends Component<InputProps, IState> {
               {showLabelIcon && (
                 <>
                   <InfoCircle width={20} className={styles.infoCircle} />
-                  {tooltipText && <span className={styles.infoCircleText}>{tooltipText}</span>}
+                  {tooltipText && <span className={`${styles.infoCircleText} ${tooltipStyle}`}>{tooltipText}</span>}
                 </>
               )}
             </div>
@@ -423,6 +424,7 @@ export interface InputProps {
   label?: string;
   showLabelIcon?: boolean;
   tooltipText?: string;
+  tooltipStyle?: string;
   minWidth?: number;
   width?: number;
 
diff --git a/lib/typescript/components/inputs/Input/style.module.scss b/lib/typescript/components/inputs/Input/style.module.scss
index 030f41a7dc..86712ecb45 100644
--- a/lib/typescript/components/inputs/Input/style.module.scss
+++ b/lib/typescript/components/inputs/Input/style.module.scss
@@ -222,12 +222,14 @@
 
 .infoCircleText {
   @include font-s-bold;
+  line-height: 14px;
   display: none;
   background: var(--color-tooltip-gray);
   border-radius: 4px;
   margin-left: 4px;
   padding: 4px 6px;
   color: var(--color-text-contrast);
+  border-color: transparent var(--color-tooltip-gray) transparent transparent;
 }
 
 .infoCircle:hover ~ .infoCircleText {
@@ -242,7 +244,8 @@
   top: 50%;
   right: 100%;
   margin-top: -5px;
+  margin-right: inherit;
   border-width: 5px;
   border-style: solid;
-  border-color: transparent var(--color-tooltip-gray) transparent transparent;
+  border-color: inherit;
 }
diff --git a/lib/typescript/components/inputs/SearchField/index.tsx b/lib/typescript/components/inputs/SearchField/index.tsx
index e829b1d144..545d35d283 100644
--- a/lib/typescript/components/inputs/SearchField/index.tsx
+++ b/lib/typescript/components/inputs/SearchField/index.tsx
@@ -12,10 +12,21 @@ type Props = {
   resetClicked?: () => void;
   autoFocus?: boolean;
   dataCy?: string;
+  className?: string;
   style?: CSSProperties;
 };
 
-export const SearchField = ({id, placeholder, value, setValue, resetClicked, autoFocus, dataCy, style}: Props) => {
+export const SearchField = ({
+  id,
+  placeholder,
+  value,
+  setValue,
+  resetClicked,
+  autoFocus,
+  dataCy,
+  className,
+  style,
+}: Props) => {
   const inputRef = createRef<HTMLInputElement>();
   const resetButton = useCallback(() => {
     setValue('');
@@ -25,7 +36,7 @@ export const SearchField = ({id, placeholder, value, setValue, resetClicked, aut
   }, [value, setValue]);
 
   return (
-    <div className={styles.component} style={style}>
+    <div className={`${className} ${styles.component}`} style={style}>
       <div className={styles.searchIcon}>
         <SearchIcon aria-hidden="true" className={styles.searchIcon} />
       </div>
diff --git a/lib/typescript/components/tooltip/index.module.scss b/lib/typescript/components/tooltip/index.module.scss
index d7f4aba641..c8d6b41f09 100644
--- a/lib/typescript/components/tooltip/index.module.scss
+++ b/lib/typescript/components/tooltip/index.module.scss
@@ -1,11 +1,32 @@
 @import 'assets/scss/fonts.scss';
 @import 'assets/scss/colors.scss';
 
-.tooltipContainer {
+.tooltipContainer.top {
   display: flex;
+  flex-direction: column-reverse;
+  align-items: center;
+  width: 100%;
+}
+
+.tooltipContainer.right {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  width: 100%;
+}
+
+.tooltipContainer.bottom {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+}
+
+.tooltipContainer.left {
+  display: flex;
+  flex-direction: row-reverse;
   align-items: center;
   width: 100%;
-  //   margin-left: 50%;
 }
 
 .tooltipContent {
@@ -13,23 +34,52 @@
   display: none;
   background: var(--color-tooltip-gray);
   border-radius: 4px;
-  margin-left: 4px;
   padding: 4px 6px;
   color: var(--color-text-contrast);
   max-width: 180px;
   position: relative;
-  margin-left: 16px;
 }
 
-.tooltip {
-  margin-left: 32px;
+.hoverElement:hover ~ .tooltipContent.top {
+  display: flex;
+  flex-direction: column;
+  line-height: 14px;
+  white-space: nowrap;
+  margin-bottom: 12px;
+}
+
+.hoverElement:hover ~ .tooltipContent.right {
+  display: flex;
+  line-height: 14px;
+  white-space: nowrap;
+  margin-left: 12px;
+}
+
+.hoverElement:hover ~ .tooltipContent.bottom {
+  display: flex;
+  line-height: 14px;
+  white-space: nowrap;
+  margin-top: 12px;
 }
 
-.hoverElement:hover ~ .tooltipContent {
+.hoverElement:hover ~ .tooltipContent.left {
   display: flex;
+  line-height: 14px;
+  white-space: nowrap;
+  margin-right: 12px;
 }
 
-.hoverElement ~ .tooltipContent::after {
+.hoverElement ~ .tooltipContent.top::after {
+  content: '';
+  position: absolute;
+  top: 100%;
+  right: calc(50% - 5px);
+  border-width: 5px;
+  border-style: solid;
+  border-color: var(--color-tooltip-gray) transparent transparent transparent;
+}
+
+.hoverElement ~ .tooltipContent.right::after {
   content: '';
   position: absolute;
   top: 50%;
@@ -39,3 +89,24 @@
   border-style: solid;
   border-color: transparent var(--color-tooltip-gray) transparent transparent;
 }
+
+.hoverElement ~ .tooltipContent.bottom::after {
+  content: '';
+  position: absolute;
+  bottom: 100%;
+  right: calc(50% - 5px);
+  border-width: 5px;
+  border-style: solid;
+  border-color: transparent transparent var(--color-tooltip-gray) transparent;
+}
+
+.hoverElement ~ .tooltipContent.left::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 100%;
+  margin-top: -5px;
+  border-width: 5px;
+  border-style: solid;
+  border-color: transparent transparent transparent var(--color-tooltip-gray);
+}
diff --git a/lib/typescript/components/tooltip/index.tsx b/lib/typescript/components/tooltip/index.tsx
index 41079ef5fd..4c458ee668 100644
--- a/lib/typescript/components/tooltip/index.tsx
+++ b/lib/typescript/components/tooltip/index.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import {useNavigate} from 'react-router-dom';
 import styles from './index.module.scss';
 
 type TooltipProps = {
@@ -6,17 +7,32 @@ type TooltipProps = {
   hoverElementHeight?: number;
   hoverElementWidth: number;
   tooltipContent: string;
+  direction: 'top' | 'right' | 'bottom' | 'left';
+  navigateTo?: string;
 };
 
 export const Tooltip = (props: TooltipProps) => {
-  const {hoverElement, hoverElementHeight, hoverElementWidth, tooltipContent} = props;
+  const {hoverElement, hoverElementHeight, hoverElementWidth, tooltipContent, direction, navigateTo} = props;
+  const navigate = useNavigate();
+
+  const handleOnClick = (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+    event.stopPropagation();
+    navigateTo && navigate(navigateTo, {state: {from: 'status'}});
+  };
 
   return (
-    <div className={styles.tooltipContainer} style={{marginLeft: `calc(50% - (${hoverElementWidth}px / 2)`}}>
-      <div className={styles.hoverElement} style={{height: `${hoverElementHeight}px`}}>
+    <div
+      className={`${styles.tooltipContainer} ${styles[direction]}`}
+      style={{maxHeight: `${hoverElementHeight}px`, maxWidth: `${hoverElementWidth}px`}}
+    >
+      <div
+        className={styles.hoverElement}
+        style={{height: `${hoverElementHeight}px`}}
+        onClick={event => handleOnClick(event)}
+      >
         {hoverElement}
       </div>
-      <span className={styles.tooltipContent}>{tooltipContent}</span>
+      <span className={`${styles.tooltipContent} ${styles[direction]}`}>{tooltipContent}</span>
     </div>
   );
 };
diff --git a/lib/typescript/httpclient/publish_package.json b/lib/typescript/httpclient/publish_package.json
index fb43d00186..9bd28a1338 100644
--- a/lib/typescript/httpclient/publish_package.json
+++ b/lib/typescript/httpclient/publish_package.json
@@ -17,7 +17,7 @@
   "homepage": "https://github.com/airyhq/airy#readme",
   "dependencies": {
     "node-fetch": "^2.0.0",
-    "camelcase-keys": "^7.0.0",
+    "camelcase-keys": "^8.0.2",
     "form-data": "^4.0.0"
   },
   "devDependencies": {
diff --git a/lib/typescript/httpclient/src/client.ts b/lib/typescript/httpclient/src/client.ts
index 469fad0874..a115ef81dc 100644
--- a/lib/typescript/httpclient/src/client.ts
+++ b/lib/typescript/httpclient/src/client.ts
@@ -12,6 +12,7 @@ import {
   ConnectChatPluginRequestPayload,
   ConnectTwilioSmsRequestPayload,
   ConnectTwilioWhatsappRequestPayload,
+  ConnectWhatsappRequestPayload,
   ConnectChannelGoogleRequestPayload,
   UpdateChannelRequestPayload,
   ListTemplatesRequestPayload,
@@ -31,6 +32,7 @@ import {
   EnableDisableComponentRequestPayload,
   UpdateComponentConfigurationRequestPayload,
   InstallUninstallComponentRequestPayload,
+  ConnectViberRequestPayload,
 } from './payload';
 import {
   listChannelsDef,
@@ -41,6 +43,7 @@ import {
   connectChatPluginChannelDef,
   connectTwilioSmsChannelDef,
   connectTwilioWhatsappChannelDef,
+  connectWhatsappChannelDef,
   connectGoogleChannelDef,
   updateChannelDef,
   disconnectChannelDef,
@@ -75,6 +78,7 @@ import {
   installComponentDef,
   uninstallComponentDef,
   componentsListDef,
+  connectViberChannelDef,
 } from './endpoints';
 import 'isomorphic-fetch';
 import FormData from 'form-data';
@@ -193,6 +197,10 @@ export class HttpClient {
     connectTwilioWhatsappChannelDef
   );
 
+  public connectWhatsappChannel = this.getRequest<ConnectWhatsappRequestPayload, Channel>(connectWhatsappChannelDef);
+
+  public connectViberChannel = this.getRequest<ConnectViberRequestPayload, Channel>(connectViberChannelDef);
+
   public connectGoogleChannel = this.getRequest<ConnectChannelGoogleRequestPayload, Channel>(connectGoogleChannelDef);
 
   public connectInstagramChannel = this.getRequest<ConnectChannelInstagramRequestPayload, Channel>(
diff --git a/lib/typescript/httpclient/src/endpoints/connectChatPluginChannel.ts b/lib/typescript/httpclient/src/endpoints/connectChatPluginChannel.ts
index 37adbfd095..1433ed96ef 100644
--- a/lib/typescript/httpclient/src/endpoints/connectChatPluginChannel.ts
+++ b/lib/typescript/httpclient/src/endpoints/connectChatPluginChannel.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const connectChatPluginChannelDef = {
   endpoint: 'channels.chatplugin.connect',
diff --git a/lib/typescript/httpclient/src/endpoints/connectFacebookChannel.ts b/lib/typescript/httpclient/src/endpoints/connectFacebookChannel.ts
index 4d33aa83a8..156c529ce5 100644
--- a/lib/typescript/httpclient/src/endpoints/connectFacebookChannel.ts
+++ b/lib/typescript/httpclient/src/endpoints/connectFacebookChannel.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const connectFacebookChannelDef = {
   endpoint: 'channels.facebook.connect',
diff --git a/lib/typescript/httpclient/src/endpoints/connectGoogleChannel.ts b/lib/typescript/httpclient/src/endpoints/connectGoogleChannel.ts
index 9f0c66f70b..ee4f6e0c98 100644
--- a/lib/typescript/httpclient/src/endpoints/connectGoogleChannel.ts
+++ b/lib/typescript/httpclient/src/endpoints/connectGoogleChannel.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const connectGoogleChannelDef = {
   endpoint: 'channels.google.connect',
diff --git a/lib/typescript/httpclient/src/endpoints/connectInstagramChannel.ts b/lib/typescript/httpclient/src/endpoints/connectInstagramChannel.ts
index ff2d7a51a9..431c78ea93 100644
--- a/lib/typescript/httpclient/src/endpoints/connectInstagramChannel.ts
+++ b/lib/typescript/httpclient/src/endpoints/connectInstagramChannel.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const connectInstagramChannelDef = {
   endpoint: 'channels.instagram.connect',
diff --git a/lib/typescript/httpclient/src/endpoints/connectTwilioSmsChannel.ts b/lib/typescript/httpclient/src/endpoints/connectTwilioSmsChannel.ts
index 3ca5ba5433..cc6724c05f 100644
--- a/lib/typescript/httpclient/src/endpoints/connectTwilioSmsChannel.ts
+++ b/lib/typescript/httpclient/src/endpoints/connectTwilioSmsChannel.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const connectTwilioSmsChannelDef = {
   endpoint: 'channels.twilio.sms.connect',
diff --git a/lib/typescript/httpclient/src/endpoints/connectTwilioWhatsappChannel.ts b/lib/typescript/httpclient/src/endpoints/connectTwilioWhatsappChannel.ts
index ffbb3f1753..7a56dd0412 100644
--- a/lib/typescript/httpclient/src/endpoints/connectTwilioWhatsappChannel.ts
+++ b/lib/typescript/httpclient/src/endpoints/connectTwilioWhatsappChannel.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const connectTwilioWhatsappChannelDef = {
   endpoint: 'channels.twilio.whatsapp.connect',
diff --git a/lib/typescript/httpclient/src/endpoints/connectViberChannel.ts b/lib/typescript/httpclient/src/endpoints/connectViberChannel.ts
new file mode 100644
index 0000000000..f341bc3b46
--- /dev/null
+++ b/lib/typescript/httpclient/src/endpoints/connectViberChannel.ts
@@ -0,0 +1,10 @@
+import camelcaseKeys from 'camelcase-keys';
+
+export const connectViberChannelDef = {
+  endpoint: 'channels.viber.connect',
+  mapRequest: ({name, imageUrl}) => ({
+    name,
+    image_url: imageUrl,
+  }),
+  mapResponse: response => camelcaseKeys(response, {deep: true, stopPaths: ['metadata.user_data']}),
+};
diff --git a/lib/typescript/httpclient/src/endpoints/connectWhatsappChannel.ts b/lib/typescript/httpclient/src/endpoints/connectWhatsappChannel.ts
new file mode 100644
index 0000000000..69cdf1b0e7
--- /dev/null
+++ b/lib/typescript/httpclient/src/endpoints/connectWhatsappChannel.ts
@@ -0,0 +1,12 @@
+import camelcaseKeys from 'camelcase-keys';
+
+export const connectWhatsappChannelDef = {
+  endpoint: 'channels.whatsapp.connect',
+  mapRequest: ({phoneNumberId, userToken, name, imageUrl}) => ({
+    phone_number_id: phoneNumberId,
+    user_token: userToken,
+    name,
+    image_url: imageUrl,
+  }),
+  mapResponse: response => camelcaseKeys(response, {deep: true, stopPaths: ['metadata.user_data']}),
+};
diff --git a/lib/typescript/httpclient/src/endpoints/exploreFacebookChannels.ts b/lib/typescript/httpclient/src/endpoints/exploreFacebookChannels.ts
index 9ebf316720..40837948af 100644
--- a/lib/typescript/httpclient/src/endpoints/exploreFacebookChannels.ts
+++ b/lib/typescript/httpclient/src/endpoints/exploreFacebookChannels.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const exploreFacebookChannelsDef = {
   endpoint: 'facebook.channels.explore',
diff --git a/lib/typescript/httpclient/src/endpoints/getConfig.ts b/lib/typescript/httpclient/src/endpoints/getConfig.ts
index 0208576602..ea5b17f2d3 100644
--- a/lib/typescript/httpclient/src/endpoints/getConfig.ts
+++ b/lib/typescript/httpclient/src/endpoints/getConfig.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 import camelcaseKeys from 'camelcase-keys';
 
 export const getConfigDef = {
diff --git a/lib/typescript/httpclient/src/endpoints/getContactDetails.ts b/lib/typescript/httpclient/src/endpoints/getContactDetails.ts
index fe70dc3ac9..98b40c195b 100644
--- a/lib/typescript/httpclient/src/endpoints/getContactDetails.ts
+++ b/lib/typescript/httpclient/src/endpoints/getContactDetails.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const getContactDetailsDef = {
   endpoint: 'contacts.info',
diff --git a/lib/typescript/httpclient/src/endpoints/getConversationInfo.ts b/lib/typescript/httpclient/src/endpoints/getConversationInfo.ts
index 4d34b1353a..5fcd77a2df 100644
--- a/lib/typescript/httpclient/src/endpoints/getConversationInfo.ts
+++ b/lib/typescript/httpclient/src/endpoints/getConversationInfo.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const getConversationInfoDef = {
   endpoint: 'conversations.info',
diff --git a/lib/typescript/httpclient/src/endpoints/index.ts b/lib/typescript/httpclient/src/endpoints/index.ts
index 16d3de853f..f9110f1742 100644
--- a/lib/typescript/httpclient/src/endpoints/index.ts
+++ b/lib/typescript/httpclient/src/endpoints/index.ts
@@ -4,6 +4,8 @@ export * from './connectFacebookChannel';
 export * from './connectChatPluginChannel';
 export * from './connectTwilioSmsChannel';
 export * from './connectTwilioWhatsappChannel';
+export * from './connectWhatsappChannel';
+export * from './connectViberChannel';
 export * from './connectGoogleChannel';
 export * from './connectInstagramChannel';
 export * from './disconnectChannel';
diff --git a/lib/typescript/httpclient/src/endpoints/listChannels.ts b/lib/typescript/httpclient/src/endpoints/listChannels.ts
index 391e45ebc8..301c7c8514 100644
--- a/lib/typescript/httpclient/src/endpoints/listChannels.ts
+++ b/lib/typescript/httpclient/src/endpoints/listChannels.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const listChannelsDef = {
   endpoint: 'channels.list',
diff --git a/lib/typescript/httpclient/src/endpoints/listContacts.ts b/lib/typescript/httpclient/src/endpoints/listContacts.ts
index 9912a7312d..45babfd173 100644
--- a/lib/typescript/httpclient/src/endpoints/listContacts.ts
+++ b/lib/typescript/httpclient/src/endpoints/listContacts.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const listContactsDef = {
   endpoint: 'contacts.list',
diff --git a/lib/typescript/httpclient/src/endpoints/listConversations.ts b/lib/typescript/httpclient/src/endpoints/listConversations.ts
index 10c104dcd5..544e8fe0cc 100644
--- a/lib/typescript/httpclient/src/endpoints/listConversations.ts
+++ b/lib/typescript/httpclient/src/endpoints/listConversations.ts
@@ -1,6 +1,6 @@
 import {PaginatedPayload, ListConversationsRequestPayload} from '../payload';
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+
+import camelcaseKeys from 'camelcase-keys';
 import {mapMessage} from 'model';
 
 export const listConversationsDef = {
diff --git a/lib/typescript/httpclient/src/endpoints/listMessages.ts b/lib/typescript/httpclient/src/endpoints/listMessages.ts
index 20f029c50e..ed864959db 100644
--- a/lib/typescript/httpclient/src/endpoints/listMessages.ts
+++ b/lib/typescript/httpclient/src/endpoints/listMessages.ts
@@ -1,7 +1,5 @@
 import {mapMessage} from 'model';
-
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const listMessagesDef = {
   endpoint: 'messages.list',
diff --git a/lib/typescript/httpclient/src/endpoints/listTemplates.ts b/lib/typescript/httpclient/src/endpoints/listTemplates.ts
index 5c490d9529..d4da52497f 100644
--- a/lib/typescript/httpclient/src/endpoints/listTemplates.ts
+++ b/lib/typescript/httpclient/src/endpoints/listTemplates.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const listTemplatesDef = {
   endpoint: 'templates.list',
diff --git a/lib/typescript/httpclient/src/endpoints/listWebhooks.ts b/lib/typescript/httpclient/src/endpoints/listWebhooks.ts
index f0e4e5c047..59afe046ee 100644
--- a/lib/typescript/httpclient/src/endpoints/listWebhooks.ts
+++ b/lib/typescript/httpclient/src/endpoints/listWebhooks.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const listWebhooksDef = {
   endpoint: 'webhooks.list',
diff --git a/lib/typescript/httpclient/src/endpoints/subscribeWebhook.ts b/lib/typescript/httpclient/src/endpoints/subscribeWebhook.ts
index 4bf54ea2d9..17f7a2e655 100644
--- a/lib/typescript/httpclient/src/endpoints/subscribeWebhook.ts
+++ b/lib/typescript/httpclient/src/endpoints/subscribeWebhook.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const subscribeWebhookDef = {
   endpoint: 'webhooks.subscribe',
diff --git a/lib/typescript/httpclient/src/endpoints/unsubscribeWebhook.ts b/lib/typescript/httpclient/src/endpoints/unsubscribeWebhook.ts
index 6c7450b210..33d2462d13 100644
--- a/lib/typescript/httpclient/src/endpoints/unsubscribeWebhook.ts
+++ b/lib/typescript/httpclient/src/endpoints/unsubscribeWebhook.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const unsubscribeWebhookDef = {
   endpoint: 'webhooks.unsubscribe',
diff --git a/lib/typescript/httpclient/src/endpoints/updateChannel.ts b/lib/typescript/httpclient/src/endpoints/updateChannel.ts
index d8b943eda3..9d2122d318 100644
--- a/lib/typescript/httpclient/src/endpoints/updateChannel.ts
+++ b/lib/typescript/httpclient/src/endpoints/updateChannel.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const updateChannelDef = {
   endpoint: 'channels.update',
diff --git a/lib/typescript/httpclient/src/endpoints/updateWebhook.ts b/lib/typescript/httpclient/src/endpoints/updateWebhook.ts
index b681673ed7..46ecf9a86b 100644
--- a/lib/typescript/httpclient/src/endpoints/updateWebhook.ts
+++ b/lib/typescript/httpclient/src/endpoints/updateWebhook.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const updateWebhookDef = {
   endpoint: 'webhooks.update',
diff --git a/lib/typescript/httpclient/src/endpoints/uploadFile.ts b/lib/typescript/httpclient/src/endpoints/uploadFile.ts
index 733b8fec3a..b06db22491 100644
--- a/lib/typescript/httpclient/src/endpoints/uploadFile.ts
+++ b/lib/typescript/httpclient/src/endpoints/uploadFile.ts
@@ -1,7 +1,6 @@
 import _ from 'form-data';
 import {UploadFileRequestPayload} from '../payload';
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 export const uploadFileDef = {
   endpoint: 'media.upload',
diff --git a/lib/typescript/httpclient/src/payload/ConnectViberRequestPayload.ts b/lib/typescript/httpclient/src/payload/ConnectViberRequestPayload.ts
new file mode 100644
index 0000000000..4cfe4120d4
--- /dev/null
+++ b/lib/typescript/httpclient/src/payload/ConnectViberRequestPayload.ts
@@ -0,0 +1,4 @@
+export interface ConnectViberRequestPayload {
+  name?: string;
+  imageUrl?: string;
+}
diff --git a/lib/typescript/httpclient/src/payload/ConnectWhatsappRequestPayload.ts b/lib/typescript/httpclient/src/payload/ConnectWhatsappRequestPayload.ts
new file mode 100644
index 0000000000..79d8c6f1ca
--- /dev/null
+++ b/lib/typescript/httpclient/src/payload/ConnectWhatsappRequestPayload.ts
@@ -0,0 +1,6 @@
+export interface ConnectWhatsappRequestPayload {
+  phoneNumberId?: string;
+  userToken: string;
+  name?: string;
+  imageUrl?: string;
+}
diff --git a/lib/typescript/httpclient/src/payload/index.ts b/lib/typescript/httpclient/src/payload/index.ts
index a2cacc1a0f..cc82270b26 100644
--- a/lib/typescript/httpclient/src/payload/index.ts
+++ b/lib/typescript/httpclient/src/payload/index.ts
@@ -2,6 +2,8 @@ export * from './ConnectChannelRequestPayload';
 export * from './ConnectChatPluginRequestPayload';
 export * from './ConnectTwilioSmsRequestPayload';
 export * from './ConnectTwilioWhatsappRequestPayload';
+export * from './ConnectWhatsappRequestPayload';
+export * from './ConnectViberRequestPayload';
 export * from './ConnectChannelGoogleRequestPayload';
 export * from './ConnectChannelInstagramRequestPayload';
 export * from './CreateTagRequestPayload';
diff --git a/lib/typescript/model/BUILD b/lib/typescript/model/BUILD
index 61dd43edb6..e01c517a11 100644
--- a/lib/typescript/model/BUILD
+++ b/lib/typescript/model/BUILD
@@ -8,6 +8,7 @@ ts_web_library(
     name = "model",
     deps = [
         "@npm//@types/node",
+        "@npm//camelcase-keys",
     ],
 )
 
diff --git a/lib/typescript/model/Components.ts b/lib/typescript/model/Components.ts
index 7ef55dbefc..689a85044b 100644
--- a/lib/typescript/model/Components.ts
+++ b/lib/typescript/model/Components.ts
@@ -22,33 +22,9 @@ export interface ComponentInfo {
   configurationValues?: string;
 }
 
-export enum ComponentRepository {
-  airyCore = 'airy-core',
-  airyEnterprise = 'airy-enterprise',
-  airyCloud = 'airy-cloud',
-}
-
-export enum ComponentName {
-  apiAdmin = 'api-admin',
-  apiCommunication = 'api-communication',
-  apiContacts = 'api-contacts',
-  apiWebsocket = 'api-websocket',
-  cloudConnector = 'cloud-connector',
-  enterpriseDialogflowConnector = 'enterprise-dialogflow-connector',
-  enterpriseMobileAuth = 'enterprise-mobile-auth',
-  enterpriseSalesforceContactsIngestion = 'enterprise-salesforce-contacts-ingestion',
-  enterprisePushNotification = 'enterprise-push-notifiction',
-  enterpriseZendenkConnector = 'enterprise-zendesk-connector',
-  frontendControlCenter = 'frontend-control-center',
-  frontendInbox = 'frontend-inbox',
-  integrationSourceApi = 'integration-source-api',
-  integrationWebhook = 'integration-webhook',
-  mediaResolver = 'media-resolver',
-  sourcesChatPlugin = 'sources-chatplugin',
-  sourcesFacebook = 'sources-facebook',
-  sourcesGoogle = 'sources-google',
-  sourcesTwilio = 'sources-twilio',
-  sourcesViber = 'sources-viber',
-  sourcesWhatsappBusinessCloud = 'sources-whatsapp-business-cloud',
-  rasaConnector = 'rasa-connector',
+export enum ComponentStatus {
+  enabled = 'Enabled',
+  notConfigured = 'Not Configured',
+  disabled = 'Disabled',
+  notHealthy = 'Not Healthy',
 }
diff --git a/lib/typescript/model/Config.ts b/lib/typescript/model/Config.ts
index a4e4ce0a95..6631e1441f 100644
--- a/lib/typescript/model/Config.ts
+++ b/lib/typescript/model/Config.ts
@@ -26,8 +26,11 @@ export enum Language {
 
 export const getComponents = (config: Config) => {
   const {services} = config;
+  const servicesSorted = Object.fromEntries(
+    Object.entries(services).sort((a, b) => a[1].component.localeCompare(b[1].component))
+  );
 
-  return Object.keys(services).reduce((agg, key) => {
+  return Object.keys(servicesSorted).reduce((agg, key) => {
     const {healthy, enabled, component} = services[key];
 
     return {
diff --git a/lib/typescript/model/Connectors.ts b/lib/typescript/model/Connectors.ts
index 27ee0cc017..8e24fd2024 100644
--- a/lib/typescript/model/Connectors.ts
+++ b/lib/typescript/model/Connectors.ts
@@ -1,3 +1,5 @@
+import {Source} from './Source';
+
 export enum ConnectorName {
   apiAdmin = 'api-admin',
   apiCommunication = 'api-communication',
@@ -22,3 +24,27 @@ export enum ConnectorName {
   rasaConnector = 'rasa-connector',
   zendenkConnector = 'zendesk-connector',
 }
+
+export enum ConnectorPrice {
+  free = 'Free',
+  paid = 'Paid',
+  requestAccess = 'REQUEST ACCESS',
+}
+
+export type Connector = {
+  name?: string;
+  displayName?: string;
+  isInstalled?: boolean;
+  isEnabled?: boolean;
+  isHealthy?: boolean;
+  isConfigured?: boolean;
+  configureValues?: {};
+  isChannel?: boolean;
+  connectedChannels?: number;
+  price?: string;
+  source?: Source;
+};
+
+export type ConnectorsModel = {
+  [connectorName: string]: Connector;
+};
diff --git a/lib/typescript/model/Message.ts b/lib/typescript/model/Message.ts
index ea5bfbdb0b..8abfd584ef 100644
--- a/lib/typescript/model/Message.ts
+++ b/lib/typescript/model/Message.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 import {Content} from './Content';
 import {Suggestions} from './SuggestedReply';
 
diff --git a/lib/typescript/model/Source.ts b/lib/typescript/model/Source.ts
index bbbf035177..251905c89b 100644
--- a/lib/typescript/model/Source.ts
+++ b/lib/typescript/model/Source.ts
@@ -16,6 +16,9 @@ export enum Source {
   amelia = 'amelia',
   mobile = 'mobile',
   whatsapp = 'whatsapp',
+  frontendInbox = 'frontend-inbox',
+  ibm = 'ibm',
+  amazons3 = 'amazons3',
 }
 
 export const prettifySource = (source: string) =>
diff --git a/lib/typescript/render/SourceMessagePreview.tsx b/lib/typescript/render/SourceMessagePreview.tsx
index 33498a08c9..d1892694a9 100644
--- a/lib/typescript/render/SourceMessagePreview.tsx
+++ b/lib/typescript/render/SourceMessagePreview.tsx
@@ -52,6 +52,24 @@ export const SourceMessagePreview = (props: SourceMessagePreviewProps) => {
       return <ErrorMessageIcon style={{height: '20px', width: '20px'}} />;
     }
 
+    //Wa Location
+    if (lastMessageContent.type === 'location') {
+      return (
+        <>
+          <Emoji symbol={'📍'} /> Location
+        </>
+      );
+    }
+
+    //Wa Contacts
+    if (lastMessageContent.type === 'contacts') {
+      return (
+        <>
+          <Emoji symbol={'👤'} /> Contact shared
+        </>
+      );
+    }
+
     //google
     const googleLiveAgentRequest = lastMessageContent?.userStatus?.requestedLiveAgent;
     const googleSurveyResponse = lastMessageContent?.surveyResponse;
@@ -173,6 +191,8 @@ export const SourceMessagePreview = (props: SourceMessagePreviewProps) => {
     }
 
     if (
+      lastMessageContent?.type === 'image' ||
+      lastMessageContent?.type === 'sticker' ||
       lastMessageContent.message?.attachments?.[0].type === 'image' ||
       lastMessageContent?.attachment?.type === 'image' ||
       isImageFromGoogleSource(lastMessageContent.message?.text) ||
@@ -182,6 +202,7 @@ export const SourceMessagePreview = (props: SourceMessagePreviewProps) => {
     }
 
     if (
+      lastMessageContent?.type === 'video' ||
       lastMessageContent.message?.attachments?.[0].type === 'video' ||
       lastMessageContent?.attachment?.type === 'video' ||
       twilioWhatsAppInboundVideo
@@ -190,6 +211,7 @@ export const SourceMessagePreview = (props: SourceMessagePreviewProps) => {
     }
 
     if (
+      lastMessageContent?.type === 'audio' ||
       lastMessageContent.message?.attachments?.[0].type === 'audio' ||
       lastMessageContent?.attachment?.type === 'audio' ||
       twilioWhatsAppInboundAudio
@@ -198,6 +220,7 @@ export const SourceMessagePreview = (props: SourceMessagePreviewProps) => {
     }
 
     if (
+      lastMessageContent?.type === 'document' ||
       lastMessageContent.message?.attachments?.[0].type === 'file' ||
       lastMessageContent?.attachment?.type === 'file' ||
       twilioWhatsAppInboundFile
diff --git a/lib/typescript/render/providers/twilio/components/CurrentLocation/index.module.scss b/lib/typescript/render/components/CurrentLocation/index.module.scss
similarity index 61%
rename from lib/typescript/render/providers/twilio/components/CurrentLocation/index.module.scss
rename to lib/typescript/render/components/CurrentLocation/index.module.scss
index 7c5701ae58..c78f2e8cc1 100644
--- a/lib/typescript/render/providers/twilio/components/CurrentLocation/index.module.scss
+++ b/lib/typescript/render/components/CurrentLocation/index.module.scss
@@ -19,12 +19,26 @@
   color: var(--color-text-contrast);
 }
 
+.contactContent a,
+.contactContent a:hover,
+.contactContent a:visited,
+.contactContent a:active {
+  color: var(--color-text-contrast);
+}
+
 .memberContent {
   @extend .textMessage;
   background: var(--color-airy-blue);
   color: white;
 }
 
+.memberContent a,
+.memberContent a:hover,
+.memberContent a:visited,
+.memberContent a:active {
+  color: white;
+}
+
 .text {
   font-family: 'Lato', sans-serif;
 }
@@ -32,3 +46,10 @@
 .geolocation {
   @include font-s;
 }
+
+.geolocation a:link,
+.geolocation a:active,
+.geolocation a:visited,
+.geolocation a:hover {
+  text-decoration: none;
+}
diff --git a/lib/typescript/render/components/CurrentLocation/index.tsx b/lib/typescript/render/components/CurrentLocation/index.tsx
new file mode 100644
index 0000000000..8d0fa66b7e
--- /dev/null
+++ b/lib/typescript/render/components/CurrentLocation/index.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import {Emoji} from 'components';
+import styles from './index.module.scss';
+
+interface CurrentLocationProps {
+  longitude: string;
+  latitude: string;
+  name?: string;
+  address?: string;
+  fromContact: boolean;
+}
+
+export const CurrentLocation = ({longitude, latitude, name, address, fromContact}: CurrentLocationProps) => {
+  if (!longitude) longitude = 'N/A';
+  if (!latitude) latitude = 'N/A';
+
+  return (
+    <div className={`${fromContact ? styles.contactContent : styles.memberContent}`}>
+      <p className={styles.text}>
+        <Emoji symbol={'📍'} /> This user has shared its current location.
+      </p>
+      <br />
+      <p className={styles.geolocation}>
+        <a target="_blank" rel="noopener noreferrer" href={`http://maps.google.com/?q=${latitude},${longitude}`}>
+          Latitude: {latitude}, Longitude: {longitude}
+        </a>
+      </p>
+      {name && (
+        <p className={styles.geolocation}>
+          {name}{' '}
+          {address && (
+            <a target="_blank" rel="noopener noreferrer" href={`http://maps.google.com/?q=${address}`}>
+              {address}
+            </a>
+          )}
+        </p>
+      )}
+    </div>
+  );
+};
diff --git a/lib/typescript/render/components/Image/index.tsx b/lib/typescript/render/components/Image/index.tsx
index 6221af0263..63faa2a2ae 100644
--- a/lib/typescript/render/components/Image/index.tsx
+++ b/lib/typescript/render/components/Image/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {ImageWithFallback} from '../ImageWithFallback';
-import {ImageContent} from '../../providers/facebook/facebookModel';
+import {ImageContent} from '../../providers/meta/MetaModel';
 import {Text} from '../../components/Text';
 import styles from './index.module.scss';
 
diff --git a/lib/typescript/render/components/Text/index.tsx b/lib/typescript/render/components/Text/index.tsx
index cbb37b5fff..6b8bac0691 100644
--- a/lib/typescript/render/components/Text/index.tsx
+++ b/lib/typescript/render/components/Text/index.tsx
@@ -13,6 +13,7 @@ export const Text = ({text, fromContact}: TextRenderProps) => (
     className={`${fromContact ? styles.contactContent : styles.memberContent}`}
     options={{
       defaultProtocol: 'https',
+      target: '_blank',
       className: `${styles.messageLink} ${fromContact ? styles.contactContent : styles.memberContent}`,
     }}
   >
diff --git a/lib/typescript/render/components/index.ts b/lib/typescript/render/components/index.ts
index a0325c8429..e1a21e581c 100644
--- a/lib/typescript/render/components/index.ts
+++ b/lib/typescript/render/components/index.ts
@@ -3,3 +3,4 @@ export * from './Image';
 export * from './ImageWithFallback';
 export * from './Text';
 export * from './Video';
+export * from './CurrentLocation';
diff --git a/lib/typescript/render/outbound/facebook.ts b/lib/typescript/render/outbound/facebook.ts
index 743e59ccf3..bc61daa6da 100644
--- a/lib/typescript/render/outbound/facebook.ts
+++ b/lib/typescript/render/outbound/facebook.ts
@@ -1,7 +1,7 @@
 import {OutboundMapper} from './mapper';
 import {getAttachmentType} from '../services';
 
-export class FacebookMapper extends OutboundMapper {
+export class MetaMapper extends OutboundMapper {
   getTextPayload(text: string): any {
     return {
       text,
diff --git a/lib/typescript/render/outbound/index.ts b/lib/typescript/render/outbound/index.ts
index 7c1b0ed332..d23c11016b 100644
--- a/lib/typescript/render/outbound/index.ts
+++ b/lib/typescript/render/outbound/index.ts
@@ -1,4 +1,4 @@
-import {FacebookMapper} from './facebook';
+import {MetaMapper} from './facebook';
 import {ChatpluginMapper} from './chatplugin';
 import {GoogleMapper} from './google';
 import {TwilioMapper} from './twilio';
@@ -9,7 +9,7 @@ export const getOutboundMapper = (source: string) => {
   switch (source) {
     case 'facebook':
     case 'instagram':
-      return new FacebookMapper();
+      return new MetaMapper();
     case 'google':
       return new GoogleMapper();
     case 'chatplugin':
diff --git a/lib/typescript/render/outbound/whatsapp.ts b/lib/typescript/render/outbound/whatsapp.ts
index 4a39a52b19..82527e68ba 100644
--- a/lib/typescript/render/outbound/whatsapp.ts
+++ b/lib/typescript/render/outbound/whatsapp.ts
@@ -1,9 +1,9 @@
 import {OutboundMapper} from './mapper';
 
 export class WhatsAppMapper extends OutboundMapper {
-  getTextPayload(text: string): any {
+  getTextPayload(text: string): {text: string} {
     return {
-      Body: text,
+      text,
     };
   }
 
diff --git a/lib/typescript/render/providers/facebook/facebookModel.ts b/lib/typescript/render/providers/meta/MetaModel.ts
similarity index 63%
rename from lib/typescript/render/providers/facebook/facebookModel.ts
rename to lib/typescript/render/providers/meta/MetaModel.ts
index 4cb8c15e52..fbe4bef87a 100644
--- a/lib/typescript/render/providers/facebook/facebookModel.ts
+++ b/lib/typescript/render/providers/meta/MetaModel.ts
@@ -180,7 +180,116 @@ export interface DeletedMessageContent extends Content {
   type: 'deletedMessage';
 }
 
-// Add a new facebook content model here:
+//WhatsApp Business Cloud
+
+//WA template
+export interface WhatsAppTemplate extends Content {
+  type: 'whatsAppTemplate';
+  components?: WhatsAppComponents[];
+}
+
+export interface WhatsAppComponents {
+  type: 'header' | 'body' | 'button';
+  parameters: (WhatsAppParameter | WhatsAppButton)[];
+  sub_type?: 'quick_reply' | 'url';
+  index?: number;
+}
+
+export interface WhatsAppParameter extends Content {
+  type: 'currency' | 'date_time' | 'document' | 'image' | 'text' | 'video';
+  text?: string;
+  currency?: WhatsAppCurrency;
+  date_time?: WhatsAppDateTime;
+  document?: WhatsAppMedia;
+  image?: WhatsAppMedia;
+  video?: WhatsAppMedia;
+}
+
+export interface WhatsAppCurrency {
+  fallback_value: string;
+  code: string;
+  amount_1000: string;
+}
+
+export interface WhatsAppDateTime {
+  fallback_value: string;
+}
+
+export interface WhatsAppButton extends Content {
+  type: 'button';
+  parameters: [
+    {
+      type: 'payload' | 'text';
+      payload?: string;
+      text?: string;
+    }
+  ];
+}
+
+//WA Media
+type WhatsAppMediaContent = {
+  link: string;
+  caption?: string;
+};
+
+export interface WhatsAppMediaInfo extends Content {
+  type: 'whatsAppMedia';
+  mediaType: WhatsAppMediaType;
+}
+
+type WhatsAppMedia = WhatsAppMediaInfo & WhatsAppMediaContent;
+
+export enum WhatsAppMediaType {
+  video = 'video',
+  image = 'image',
+  document = 'document',
+  audio = 'audio',
+  sticker = 'sticker',
+}
+
+//WA Location
+export interface WhatsAppLocation extends Content {
+  type: 'whatsAppLocation';
+  longitude: string;
+  latitude: string;
+  name?: string;
+  address?: string;
+}
+
+//WA Interactive
+export interface WhatsAppInteractive extends Content {
+  type: 'whatsAppInteractive';
+  action: WhatsAppInteractiveAction;
+  header?: WhatsAppInteractiveHeader;
+  body?: {text: string};
+  footer?: {text: string};
+}
+
+export interface WhatsAppInteractiveAction {
+  button: string;
+  buttons: WhatsAppInteractiveButton[];
+}
+
+export interface WhatsAppInteractiveButton {
+  type: 'reply';
+  reply: {title: string};
+}
+
+export interface WhatsAppInteractiveHeader {
+  type: 'text' | 'video' | 'image' | 'document';
+  text?: string;
+  video?: WhatsAppMediaContent;
+  image?: WhatsAppMediaContent;
+  document?: WhatsAppMediaContent;
+}
+
+//WA Contacts
+export interface WhatsAppContacts extends Content {
+  type: 'whatsAppContacts';
+  formattedName: string;
+}
+
+// Add a new Meta content model here:
 export type ContentUnion =
   | TextContent
   | PostbackButton
@@ -197,7 +306,12 @@ export type ContentUnion =
   | StoryRepliesContent
   | ShareContent
   | Fallback
-  | DeletedMessageContent;
+  | DeletedMessageContent
+  | WhatsAppTemplate
+  | WhatsAppMedia
+  | WhatsAppLocation
+  | WhatsAppInteractive
+  | WhatsAppContacts;
 
 export type AttachmentUnion =
   | TextContent
diff --git a/lib/typescript/render/providers/facebook/FacebookRender.tsx b/lib/typescript/render/providers/meta/MetaRender.tsx
similarity index 61%
rename from lib/typescript/render/providers/facebook/FacebookRender.tsx
rename to lib/typescript/render/providers/meta/MetaRender.tsx
index 82ba5f4ba7..c35847f049 100644
--- a/lib/typescript/render/providers/facebook/FacebookRender.tsx
+++ b/lib/typescript/render/providers/meta/MetaRender.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {RenderPropsUnion} from '../../props';
-import {Text, Image, Video, File} from '../../components';
+import {Text, Image, Video, File, CurrentLocation} from '../../components';
 import {AudioClip} from 'components';
 import {QuickReplies} from './components/QuickReplies';
 import {
@@ -10,19 +10,27 @@ import {
   ButtonAttachment,
   GenericAttachment,
   MediaAttachment,
-} from './facebookModel';
-import {ButtonTemplate} from './components/ButtonTemplate';
-import {GenericTemplate} from './components/GenericTemplate';
-import {MediaTemplate} from './components/MediaTemplate';
-import {FallbackAttachment} from './components/FallbackAttachment';
-import {StoryMention} from './components/InstagramStoryMention';
-import {StoryReplies} from './components/InstagramStoryReplies';
-import {Share} from './components/InstagramShare';
-import {DeletedMessage} from './components/DeletedMessage';
-
-export const FacebookRender = (props: RenderPropsUnion) => {
+  WhatsAppMediaType,
+} from './MetaModel';
+import {
+  ButtonTemplate,
+  GenericTemplate,
+  MediaTemplate,
+  FallbackAttachment,
+  StoryMention,
+  StoryReplies,
+  Share,
+  DeletedMessage,
+  WhatsAppMedia,
+  WhatsAppTemplate,
+  WhatsAppInteractive,
+  WhatsAppContacts,
+} from './components';
+import {Source} from 'model';
+
+export const MetaRender = (props: RenderPropsUnion) => {
   const message = props.message;
-  const content = message.fromContact ? facebookInbound(message) : facebookOutbound(message);
+  const content = message.fromContact ? metaInbound(message) : metaOutbound(message);
   return render(content, props);
 };
 
@@ -93,6 +101,37 @@ function render(content: ContentUnion, props: RenderPropsUnion) {
     case 'deletedMessage':
       return <DeletedMessage fromContact={props.message.fromContact || false} />;
 
+    //Whatsapp Business Cloud
+    case 'whatsAppTemplate':
+      return <WhatsAppTemplate components={content.components} />;
+
+    case 'whatsAppMedia':
+      return <WhatsAppMedia mediaType={content.mediaType} link={content?.link} caption={content?.caption} />;
+
+    case 'whatsAppLocation':
+      return (
+        <CurrentLocation
+          latitude={content.latitude}
+          longitude={content.longitude}
+          name={content?.name}
+          address={content?.address}
+          fromContact={props.message.fromContact || false}
+        />
+      );
+
+    case 'whatsAppInteractive':
+      return (
+        <WhatsAppInteractive
+          action={content.action}
+          header={content.header}
+          body={content.body}
+          footer={content.footer}
+        />
+      );
+
+    case 'whatsAppContacts':
+      return <WhatsAppContacts formattedName={content.formattedName} />;
+
     default:
       return null;
   }
@@ -174,11 +213,11 @@ const parseAttachment = (
 
   return {
     type: 'text',
-    text: 'Unsupported message type',
+    text: JSON.stringify(attachment),
   };
 };
 
-function facebookInbound(message): ContentUnion {
+function metaInbound(message): ContentUnion {
   const messageJson = message.content.message ?? message.content;
 
   if (messageJson.attachment?.type === 'fallback' || messageJson.attachments?.[0].type === 'fallback') {
@@ -236,17 +275,71 @@ function facebookInbound(message): ContentUnion {
   if (messageJson.text) {
     return {
       type: 'text',
-      text: messageJson.text,
+      text: messageJson?.text?.body ?? messageJson.text,
     };
   }
 
+  //WhatsApp Business Cloud
+  if (message.source === Source.whatsapp) {
+    //Template
+    if (messageJson.type === 'template' && messageJson.template?.components) {
+      return {
+        type: 'whatsAppTemplate',
+        components: messageJson.template.components,
+      };
+    }
+
+    //Media
+    if (messageJson.type in WhatsAppMediaType) {
+      const media = messageJson.type;
+      return {
+        type: 'whatsAppMedia',
+        mediaType: media,
+        link: messageJson[media]?.link,
+        caption: messageJson[media]?.caption ?? null,
+      };
+    }
+
+    //Location
+    if (messageJson.type === 'location') {
+      return {
+        type: 'whatsAppLocation',
+        longitude: messageJson.location.longitude,
+        latitude: messageJson.location.latitude,
+        name: messageJson.location?.name,
+        address: messageJson.location?.address,
+      };
+    }
+
+    //Interactive
+    if (messageJson.type === 'interactive') {
+      const isActionRenderable = messageJson?.interactive?.action?.button || messageJson?.interactive?.action?.buttons;
+      const actionToBeRendered = isActionRenderable ? {...messageJson?.interactive?.action} : null;
+      return {
+        type: 'whatsAppInteractive',
+        action: actionToBeRendered,
+        header: messageJson.interactive?.header ?? null,
+        body: messageJson.interactive?.body ?? null,
+        footer: messageJson.interactive?.footer ?? null,
+      };
+    }
+
+    //Contacts
+    if (messageJson.type === 'contacts') {
+      return {
+        type: 'whatsAppContacts',
+        formattedName: messageJson?.contacts[0]?.name?.formatted_name,
+      };
+    }
+  }
+
   return {
     type: 'text',
-    text: 'Unsupported message type',
+    text: JSON.stringify(messageJson),
   };
 }
 
-function facebookOutbound(message): ContentUnion {
+function metaOutbound(message): ContentUnion {
   const messageJson = message?.content?.message || message?.content || message;
 
   if (messageJson.quick_replies) {
@@ -322,12 +415,69 @@ function facebookOutbound(message): ContentUnion {
   if (messageJson.text) {
     return {
       type: 'text',
-      text: messageJson.text,
+      text: messageJson?.text?.body ?? messageJson.text,
     };
   }
 
+  //WhatsApp Business Cloud
+  if (message.source === Source.whatsapp) {
+    //Template
+    if (messageJson.type === 'template' && messageJson.template?.components) {
+      return {
+        type: 'whatsAppTemplate',
+        components: messageJson.template.components,
+      };
+    }
+
+    //Media
+    if (messageJson.type in WhatsAppMediaType) {
+      const media = messageJson.type;
+
+      if (messageJson[media]?.link) {
+        return {
+          type: 'whatsAppMedia',
+          mediaType: media,
+          link: messageJson[media]?.link,
+          caption: messageJson[media]?.caption ?? null,
+        };
+      }
+    }
+
+    //Location
+    if (messageJson.type === 'location') {
+      return {
+        type: 'whatsAppLocation',
+        longitude: messageJson.location.longitude,
+        latitude: messageJson.location.latitude,
+        name: messageJson.location?.name,
+        address: messageJson.location?.address,
+      };
+    }
+
+    //Interactive
+    if (messageJson.type === 'interactive') {
+      const isActionRenderable = messageJson?.interactive?.action?.button || messageJson?.interactive?.action?.buttons;
+      const actionToBeRendered = isActionRenderable ? {...messageJson?.interactive?.action} : null;
+      return {
+        type: 'whatsAppInteractive',
+        action: actionToBeRendered,
+        header: messageJson.interactive?.header ?? null,
+        body: messageJson.interactive?.body ?? null,
+        footer: messageJson.interactive?.footer ?? null,
+      };
+    }
+
+    //Contacts
+    if (messageJson.type === 'contacts') {
+      return {
+        type: 'whatsAppContacts',
+        formattedName: messageJson?.contacts[0]?.name?.formatted_name,
+      };
+    }
+  }
+
   return {
     type: 'text',
-    text: 'Unsupported message type',
+    text: JSON.stringify(messageJson),
   };
 }
diff --git a/lib/typescript/render/providers/facebook/components/ButtonTemplate/index.module.scss b/lib/typescript/render/providers/meta/components/ButtonTemplate/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/ButtonTemplate/index.module.scss
rename to lib/typescript/render/providers/meta/components/ButtonTemplate/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/ButtonTemplate/index.tsx b/lib/typescript/render/providers/meta/components/ButtonTemplate/index.tsx
similarity index 86%
rename from lib/typescript/render/providers/facebook/components/ButtonTemplate/index.tsx
rename to lib/typescript/render/providers/meta/components/ButtonTemplate/index.tsx
index 79f262b7f8..d347b4d5eb 100644
--- a/lib/typescript/render/providers/facebook/components/ButtonTemplate/index.tsx
+++ b/lib/typescript/render/providers/meta/components/ButtonTemplate/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {Buttons} from '../Buttons';
 
-import {ButtonTemplate as ButtonTemplateModel} from '../../facebookModel';
+import {ButtonTemplate as ButtonTemplateModel} from '../../MetaModel';
 
 import styles from './index.module.scss';
 
diff --git a/lib/typescript/render/providers/facebook/components/Buttons/index.module.scss b/lib/typescript/render/providers/meta/components/Buttons/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/Buttons/index.module.scss
rename to lib/typescript/render/providers/meta/components/Buttons/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/Buttons/index.tsx b/lib/typescript/render/providers/meta/components/Buttons/index.tsx
similarity index 95%
rename from lib/typescript/render/providers/facebook/components/Buttons/index.tsx
rename to lib/typescript/render/providers/meta/components/Buttons/index.tsx
index 26e71a1a43..7c80e59a81 100644
--- a/lib/typescript/render/providers/facebook/components/Buttons/index.tsx
+++ b/lib/typescript/render/providers/meta/components/Buttons/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {URLButton, PostbackButton, CallButton, LoginButton, LogoutButton, GamePlayButton} from '../../facebookModel';
+import {URLButton, PostbackButton, CallButton, LoginButton, LogoutButton, GamePlayButton} from '../../MetaModel';
 import styles from './index.module.scss';
 
 type ButtonsProps = {
diff --git a/lib/typescript/render/providers/facebook/components/DeletedMessage/index.module.scss b/lib/typescript/render/providers/meta/components/DeletedMessage/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/DeletedMessage/index.module.scss
rename to lib/typescript/render/providers/meta/components/DeletedMessage/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/DeletedMessage/index.tsx b/lib/typescript/render/providers/meta/components/DeletedMessage/index.tsx
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/DeletedMessage/index.tsx
rename to lib/typescript/render/providers/meta/components/DeletedMessage/index.tsx
diff --git a/lib/typescript/render/providers/facebook/components/FallbackAttachment/index.module.scss b/lib/typescript/render/providers/meta/components/FallbackAttachment/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/FallbackAttachment/index.module.scss
rename to lib/typescript/render/providers/meta/components/FallbackAttachment/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/FallbackAttachment/index.tsx b/lib/typescript/render/providers/meta/components/FallbackAttachment/index.tsx
similarity index 92%
rename from lib/typescript/render/providers/facebook/components/FallbackAttachment/index.tsx
rename to lib/typescript/render/providers/meta/components/FallbackAttachment/index.tsx
index 0bfdf6fffb..407ade5419 100644
--- a/lib/typescript/render/providers/facebook/components/FallbackAttachment/index.tsx
+++ b/lib/typescript/render/providers/meta/components/FallbackAttachment/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {Text} from '../../../../components/Text';
-import {Fallback} from '../../facebookModel';
+import {Fallback} from '../../MetaModel';
 import styles from './index.module.scss';
 
 interface FallbackProps {
diff --git a/lib/typescript/render/providers/facebook/components/GenericTemplate/index.module.scss b/lib/typescript/render/providers/meta/components/GenericTemplate/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/GenericTemplate/index.module.scss
rename to lib/typescript/render/providers/meta/components/GenericTemplate/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/GenericTemplate/index.tsx b/lib/typescript/render/providers/meta/components/GenericTemplate/index.tsx
similarity index 86%
rename from lib/typescript/render/providers/facebook/components/GenericTemplate/index.tsx
rename to lib/typescript/render/providers/meta/components/GenericTemplate/index.tsx
index ea450ab60d..fa74c27871 100644
--- a/lib/typescript/render/providers/facebook/components/GenericTemplate/index.tsx
+++ b/lib/typescript/render/providers/meta/components/GenericTemplate/index.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
 import {Carousel} from 'components';
-import {GenericTemplate as GenericTemplateModel} from '../../facebookModel';
-import {ImageWithFallback} from 'render/components/ImageWithFallback';
+import {GenericTemplate as GenericTemplateModel} from '../../MetaModel';
+import {ImageWithFallback} from '../../../../components';
 import {Buttons} from '../Buttons';
 
 import styles from './index.module.scss';
diff --git a/lib/typescript/render/providers/facebook/components/InstagramShare/index.module.scss b/lib/typescript/render/providers/meta/components/InstagramShare/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/InstagramShare/index.module.scss
rename to lib/typescript/render/providers/meta/components/InstagramShare/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/InstagramShare/index.tsx b/lib/typescript/render/providers/meta/components/InstagramShare/index.tsx
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/InstagramShare/index.tsx
rename to lib/typescript/render/providers/meta/components/InstagramShare/index.tsx
diff --git a/lib/typescript/render/providers/facebook/components/InstagramStoryMention/index.module.scss b/lib/typescript/render/providers/meta/components/InstagramStoryMention/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/InstagramStoryMention/index.module.scss
rename to lib/typescript/render/providers/meta/components/InstagramStoryMention/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/InstagramStoryMention/index.tsx b/lib/typescript/render/providers/meta/components/InstagramStoryMention/index.tsx
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/InstagramStoryMention/index.tsx
rename to lib/typescript/render/providers/meta/components/InstagramStoryMention/index.tsx
diff --git a/lib/typescript/render/providers/facebook/components/InstagramStoryReplies/index.module.scss b/lib/typescript/render/providers/meta/components/InstagramStoryReplies/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/InstagramStoryReplies/index.module.scss
rename to lib/typescript/render/providers/meta/components/InstagramStoryReplies/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/InstagramStoryReplies/index.tsx b/lib/typescript/render/providers/meta/components/InstagramStoryReplies/index.tsx
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/InstagramStoryReplies/index.tsx
rename to lib/typescript/render/providers/meta/components/InstagramStoryReplies/index.tsx
diff --git a/lib/typescript/render/providers/facebook/components/MediaTemplate/index.module.scss b/lib/typescript/render/providers/meta/components/MediaTemplate/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/MediaTemplate/index.module.scss
rename to lib/typescript/render/providers/meta/components/MediaTemplate/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/MediaTemplate/index.tsx b/lib/typescript/render/providers/meta/components/MediaTemplate/index.tsx
similarity index 91%
rename from lib/typescript/render/providers/facebook/components/MediaTemplate/index.tsx
rename to lib/typescript/render/providers/meta/components/MediaTemplate/index.tsx
index 6f5c4a9cb0..541332f13a 100644
--- a/lib/typescript/render/providers/facebook/components/MediaTemplate/index.tsx
+++ b/lib/typescript/render/providers/meta/components/MediaTemplate/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {MediaTemplate as MediaTemplateModel} from '../../facebookModel';
+import {MediaTemplate as MediaTemplateModel} from '../../MetaModel';
 import {Buttons} from '../Buttons';
 import styles from './index.module.scss';
 
diff --git a/lib/typescript/render/providers/facebook/components/QuickReplies/index.module.scss b/lib/typescript/render/providers/meta/components/QuickReplies/index.module.scss
similarity index 100%
rename from lib/typescript/render/providers/facebook/components/QuickReplies/index.module.scss
rename to lib/typescript/render/providers/meta/components/QuickReplies/index.module.scss
diff --git a/lib/typescript/render/providers/facebook/components/QuickReplies/index.tsx b/lib/typescript/render/providers/meta/components/QuickReplies/index.tsx
similarity index 95%
rename from lib/typescript/render/providers/facebook/components/QuickReplies/index.tsx
rename to lib/typescript/render/providers/meta/components/QuickReplies/index.tsx
index c9fb56d246..f3fc5e5ad6 100644
--- a/lib/typescript/render/providers/facebook/components/QuickReplies/index.tsx
+++ b/lib/typescript/render/providers/meta/components/QuickReplies/index.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import {Text} from '../../../../components/Text';
 import {Video} from '../../../../components/Video';
 import {Image} from '../../../../components/Image';
-import {QuickReply, AttachmentUnion} from '../../facebookModel';
+import {QuickReply, AttachmentUnion} from '../../MetaModel';
 import {ImageWithFallback} from 'render/components/ImageWithFallback';
 
 import styles from './index.module.scss';
diff --git a/lib/typescript/render/providers/meta/components/WhatsAppContacts/index.module.scss b/lib/typescript/render/providers/meta/components/WhatsAppContacts/index.module.scss
new file mode 100644
index 0000000000..b5e9d96179
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/WhatsAppContacts/index.module.scss
@@ -0,0 +1,23 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.contactsWrapper {
+  max-width: 300px;
+  padding: 10px;
+  display: flex;
+  align-items: center;
+  border-radius: 12px;
+  background-color: var(--color-background-white);
+  border: 1px solid var(--color-template-border-gray);
+}
+
+.contactsWrapper img {
+  width: 50px;
+}
+
+.contactsWrapper h1 {
+  margin-left: 10px;
+  @include font-s-bold;
+  color: var(--color-text-contrast);
+  word-break: break-word;
+}
diff --git a/lib/typescript/render/providers/meta/components/WhatsAppContacts/index.tsx b/lib/typescript/render/providers/meta/components/WhatsAppContacts/index.tsx
new file mode 100644
index 0000000000..8ccd0ade41
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/WhatsAppContacts/index.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import styles from './index.module.scss';
+
+interface WhatsAppContactsProps {
+  formattedName: string;
+}
+
+export const WhatsAppContacts = ({formattedName}: WhatsAppContactsProps) => {
+  return (
+    <section className={styles.contactsWrapper}>
+      <img src="https://s3.amazonaws.com/assets.airy.co/unknown.png" alt="shared contact" />
+      <h1>{formattedName ?? 'N/A'}</h1>
+    </section>
+  );
+};
diff --git a/lib/typescript/render/providers/meta/components/WhatsAppInteractive/index.module.scss b/lib/typescript/render/providers/meta/components/WhatsAppInteractive/index.module.scss
new file mode 100644
index 0000000000..0cd190f8fa
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/WhatsAppInteractive/index.module.scss
@@ -0,0 +1,76 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.interactiveContent {
+  width: 200px;
+  max-width: 500px;
+  border-radius: 12px;
+  background-color: var(--color-background-white);
+  border: 1px solid var(--color-template-border-gray);
+  @include font-base;
+}
+
+.header {
+  width: 100%;
+  padding: 10px 20px 10px 10px;
+  color: var(--color-text-contrast);
+  border-top-right-radius: 12px;
+  border-top-left-radius: 12px;
+}
+
+.header img,
+.header video {
+  max-width: 150px;
+  border-radius: 12px;
+}
+
+.header h1 {
+  font-weight: bold;
+}
+
+.body {
+  color: var(--color-text-contrast);
+  padding: 5px 20px 5px 10px;
+}
+
+.footer {
+  color: var(--color-text-gray);
+  padding: 5px 0px 5px 10px;
+}
+
+.footerLink,
+.footerLink:active,
+.footerLink:visited,
+.footerLink:hover {
+  color: var(--color-text-gray);
+  text-decoration: none;
+}
+
+.actionButton {
+  width: 100%;
+  padding: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-top: 1px solid var(--color-template-border-gray);
+}
+.actionButton svg {
+  fill: var(--color-elements-blue);
+  margin-right: 4px;
+}
+
+.actionButton h2,
+.actionReplyButton h2 {
+  color: var(--color-elements-blue);
+}
+
+.actionReplyButton {
+  max-width: 500px;
+  padding: 5px;
+  margin-top: 5px;
+  background-color: var(--color-background-white);
+  border-radius: 12px;
+  border: 1px solid var(--color-template-border-gray);
+  text-align: center;
+  @include font-base;
+}
diff --git a/lib/typescript/render/providers/meta/components/WhatsAppInteractive/index.tsx b/lib/typescript/render/providers/meta/components/WhatsAppInteractive/index.tsx
new file mode 100644
index 0000000000..28a1b5c25a
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/WhatsAppInteractive/index.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import Linkify from 'linkify-react';
+import ReactMarkdown from 'react-markdown';
+import {WhatsAppInteractiveHeader, WhatsAppMediaType, WhatsAppInteractiveAction} from '../../MetaModel';
+import {WhatsAppMediaContent} from '../WhatsAppMedia';
+import {ReactComponent as ProductListIcon} from 'assets/images/icons/productList.svg';
+import styles from './index.module.scss';
+
+type WhatsAppInteractiveProps = {
+  action: WhatsAppInteractiveAction;
+  header?: WhatsAppInteractiveHeader;
+  body?: {text: string};
+  footer?: {text: string};
+};
+
+export const WhatsAppInteractive = ({action, header, body, footer}: WhatsAppInteractiveProps) => {
+  return (
+    <section>
+      <section className={styles.interactiveContent}>
+        {header && (
+          <section className={styles.header}>
+            {header && header.type in WhatsAppMediaType && (
+              <WhatsAppMediaContent
+                mediaType={header.type as WhatsAppMediaType}
+                link={header[header.type as WhatsAppMediaType].link}
+                caption={header[header.type as WhatsAppMediaType].caption}
+              />
+            )}
+            {header && header.type === 'text' && <h1>{header.text}</h1>}
+          </section>
+        )}
+
+        {body && (
+          <section className={styles.body}>
+            <ReactMarkdown skipHtml={true} linkTarget={'_blank'}>
+              {body.text}
+            </ReactMarkdown>
+          </section>
+        )}
+
+        {footer && (
+          <section className={styles.footer}>
+            {footer.text.startsWith('https') || footer.text.startsWith('http') ? (
+              <Linkify
+                tagName="p"
+                options={{
+                  defaultProtocol: 'https',
+                  className: `${styles.footerLink}`,
+                  target: '_blank',
+                }}
+              >
+                {footer.text}
+              </Linkify>
+            ) : (
+              <ReactMarkdown skipHtml={true} linkTarget={'_blank'}>
+                {footer.text}
+              </ReactMarkdown>
+            )}
+          </section>
+        )}
+
+        {action && action?.button && (
+          <section className={styles.actionButton}>
+            <ProductListIcon />
+            <h2>{action.button}</h2>
+          </section>
+        )}
+      </section>
+
+      {action &&
+        action?.buttons &&
+        action.buttons.map(replyButton => {
+          return (
+            <section className={styles.actionReplyButton} key={replyButton.reply.title}>
+              <h2>{replyButton.reply.title}</h2>
+            </section>
+          );
+        })}
+    </section>
+  );
+};
diff --git a/lib/typescript/render/providers/meta/components/WhatsAppMedia/index.module.scss b/lib/typescript/render/providers/meta/components/WhatsAppMedia/index.module.scss
new file mode 100644
index 0000000000..04b5c33af9
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/WhatsAppMedia/index.module.scss
@@ -0,0 +1,35 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.mediaWrapper {
+  max-width: 500px;
+  border-radius: 12px;
+  padding: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  background-color: var(--color-background-white);
+  border: 1px solid var(--color-template-border-gray);
+}
+
+.mediaWrapper :first-child {
+  margin-top: 0;
+}
+
+.mediaWrapper img,
+.mediaWrapper video {
+  max-width: 200px;
+  border-radius: 12px;
+}
+
+.caption {
+  @include font-xs;
+  margin-top: 5px;
+}
+
+.imageMedia {
+  display: block;
+  border-radius: 12px;
+  max-width: 300px;
+}
diff --git a/lib/typescript/render/providers/meta/components/WhatsAppMedia/index.tsx b/lib/typescript/render/providers/meta/components/WhatsAppMedia/index.tsx
new file mode 100644
index 0000000000..550c1c50f2
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/WhatsAppMedia/index.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import {WhatsAppMediaType} from '../../MetaModel';
+import {ImageWithFallback, Video, File} from '../../../../components';
+import {AudioClip} from 'components';
+import styles from './index.module.scss';
+
+interface WhatsAppMediaProps {
+  mediaType: WhatsAppMediaType;
+  link: string;
+  caption?: string;
+}
+
+const defaultText = 'N/A';
+
+//Caption: only use for document, image, or video media
+//https://developers.facebook.com/docs/whatsapp/cloud-api/reference/messages#media-object
+
+export const WhatsAppMedia = ({mediaType, link, caption}: WhatsAppMediaProps) => {
+  if (caption && mediaType !== 'audio') {
+    return (
+      <div className={styles.mediaWrapper}>
+        <WhatsAppMediaContent mediaType={mediaType} link={link} caption={caption} />
+      </div>
+    );
+  } else {
+    return <WhatsAppMediaContent mediaType={mediaType} link={link} caption={caption} />;
+  }
+};
+
+export const WhatsAppMediaContent = ({mediaType, link, caption}: WhatsAppMediaProps) => {
+  let mediaContent = <p>{defaultText}</p>;
+
+  if (mediaType === 'image' || mediaType === 'sticker') {
+    const isCaptionRenderable = caption && mediaType === 'image';
+    mediaContent = (
+      <>
+        <ImageWithFallback src={link} className={styles.imageMedia} />{' '}
+        {isCaptionRenderable ? <p className={styles.caption}>{caption}</p> : null}
+      </>
+    );
+  }
+
+  if (mediaType === WhatsAppMediaType.video) {
+    mediaContent = (
+      <>
+        <Video videoUrl={link} />
+        {caption ? <p className={styles.caption}>{caption}</p> : null}{' '}
+      </>
+    );
+  }
+
+  if (mediaType === WhatsAppMediaType.document) {
+    mediaContent = (
+      <>
+        <File fileUrl={link} />
+        {caption ? <p className={styles.caption}>{caption}</p> : null}{' '}
+      </>
+    );
+  }
+
+  if (mediaType === WhatsAppMediaType.audio) {
+    mediaContent = <AudioClip audioUrl={link} />;
+  }
+
+  return <>{mediaContent}</>;
+};
diff --git a/lib/typescript/render/providers/meta/components/WhatsAppTemplate/index.module.scss b/lib/typescript/render/providers/meta/components/WhatsAppTemplate/index.module.scss
new file mode 100644
index 0000000000..db9fefbcbe
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/WhatsAppTemplate/index.module.scss
@@ -0,0 +1,80 @@
+@import 'assets/scss/fonts.scss';
+@import 'assets/scss/colors.scss';
+
+.wrapper {
+  width: 250px;
+  max-width: 250px;
+  border-radius: 12px;
+  background-color: var(--color-background-white);
+  border: 1px solid var(--color-template-border-gray);
+  @include font-base;
+  color: var(--color-text-contrast);
+}
+
+.header {
+  width: 100%;
+  padding: 10px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  border-top-right-radius: 12px;
+  border-top-left-radius: 12px;
+  border-top: none;
+  border-bottom: 1px solid var(--color-template-border-gray);
+}
+
+.body,
+.button,
+.contentTemplate {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  border-bottom: 1px solid var(--color-template-border-gray);
+}
+
+.body {
+  padding: 0 10px;
+}
+
+.button {
+  padding: 10px;
+}
+
+.contentTemplate {
+  max-width: 400px;
+  padding: 10px 0px;
+}
+
+.buttonURL,
+.buttonURL:active,
+.buttonURL:visited,
+.buttonURL:hover {
+  color: var(--color-text-contrast);
+  text-decoration: none;
+}
+
+.caption {
+  @include font-xs;
+  margin-top: 5px;
+}
+
+.contentTemplate img,
+.contentTemplate video {
+  max-width: 200px;
+  border-radius: 12px;
+}
+
+.contentTemplate p {
+  text-align: center;
+}
+
+.wrapper :last-child {
+  border-bottom: none;
+}
+
+.body :last-child {
+  border-bottom: none;
+}
diff --git a/lib/typescript/render/providers/meta/components/WhatsAppTemplate/index.tsx b/lib/typescript/render/providers/meta/components/WhatsAppTemplate/index.tsx
new file mode 100644
index 0000000000..43f7ae0b53
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/WhatsAppTemplate/index.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import Linkify from 'linkify-react';
+import {WhatsAppMediaType, WhatsAppComponents, WhatsAppParameter, WhatsAppButton} from '../../MetaModel';
+import {WhatsAppMediaContent} from '../WhatsAppMedia';
+import styles from './index.module.scss';
+
+type WhatsAppTemplateProps = {
+  components: WhatsAppComponents[];
+};
+
+export const WhatsAppTemplate = ({components}: WhatsAppTemplateProps) => {
+  return (
+    <section className={styles.wrapper}>
+      {components &&
+        components.map((item, index) => {
+          return (
+            <div key={index} className={styles[item.type]}>
+              <>
+                {item.parameters.map((parameter: WhatsAppParameter | WhatsAppButton) => {
+                  let content;
+
+                  {
+                    parameter.type in WhatsAppMediaType &&
+                      (content = (
+                        <WhatsAppMediaContent
+                          mediaType={parameter.type as WhatsAppMediaType}
+                          link={parameter[parameter.type].link}
+                          caption={parameter[parameter.type]?.caption}
+                        />
+                      ));
+                  }
+
+                  {
+                    parameter.type === 'text' && (content = <p>{parameter.text}</p>);
+                  }
+
+                  {
+                    item.type === 'button' &&
+                      'text' in parameter &&
+                      (content = (
+                        <Linkify
+                          tagName="p"
+                          options={{
+                            defaultProtocol: 'https',
+                            className: `${styles.buttonURL}`,
+                            target: '_blank',
+                          }}
+                        >
+                          {parameter.text}
+                        </Linkify>
+                      ));
+                  }
+
+                  {
+                    item.type === 'button' && 'payload' in parameter && (content = <p>{parameter['payload']}</p>);
+                  }
+
+                  {
+                    parameter.type === 'currency' &&
+                      (content = (
+                        <p>
+                          {parameter.currency?.amount_1000 && parameter.currency?.code
+                            ? `${parseInt(parameter.currency.amount_1000) / 1000} ${parameter.currency?.code}`
+                            : `${parameter?.currency?.fallback_value}`}
+                        </p>
+                      ));
+                  }
+
+                  {
+                    parameter.type === 'date_time' && (content = <p> {parameter.date_time.fallback_value}</p>);
+                  }
+
+                  return (
+                    <div className={styles.contentTemplate} key={parameter.type + item.type}>
+                      {content}
+                    </div>
+                  );
+                })}
+              </>
+            </div>
+          );
+        })}
+    </section>
+  );
+};
diff --git a/lib/typescript/render/providers/meta/components/index.ts b/lib/typescript/render/providers/meta/components/index.ts
new file mode 100644
index 0000000000..e497273633
--- /dev/null
+++ b/lib/typescript/render/providers/meta/components/index.ts
@@ -0,0 +1,14 @@
+export * from './Buttons';
+export * from './ButtonTemplate';
+export * from './DeletedMessage';
+export * from './FallbackAttachment';
+export * from './GenericTemplate';
+export * from './InstagramShare';
+export * from './InstagramStoryMention';
+export * from './InstagramStoryReplies';
+export * from './MediaTemplate';
+export * from './QuickReplies';
+export * from './WhatsAppContacts';
+export * from './WhatsAppInteractive';
+export * from './WhatsAppMedia';
+export * from './WhatsAppTemplate';
diff --git a/lib/typescript/render/providers/twilio/TwilioRender.tsx b/lib/typescript/render/providers/twilio/TwilioRender.tsx
index ff4097f8ad..f9499c0509 100644
--- a/lib/typescript/render/providers/twilio/TwilioRender.tsx
+++ b/lib/typescript/render/providers/twilio/TwilioRender.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {Text, Image, File, Video} from '../../components';
 import {AudioClip} from 'components';
-import {CurrentLocation} from './components/CurrentLocation';
+import {CurrentLocation} from '../../components/CurrentLocation';
 import {RenderPropsUnion} from '../../props';
 import {ContentUnion} from './twilioModel';
 import {decodeURIComponentMessage, getAttachmentType} from '../../services';
diff --git a/lib/typescript/render/providers/twilio/components/CurrentLocation/index.tsx b/lib/typescript/render/providers/twilio/components/CurrentLocation/index.tsx
deleted file mode 100644
index 30682b1d6f..0000000000
--- a/lib/typescript/render/providers/twilio/components/CurrentLocation/index.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import {Emoji} from 'components';
-import styles from './index.module.scss';
-
-export const CurrentLocation = ({longitude, latitude, fromContact}) => {
-  return (
-    <div className={`${fromContact ? styles.contactContent : styles.memberContent}`}>
-      <span className={styles.text}>
-        <Emoji symbol={'📍'} /> This user has shared its current location.
-      </span>
-      <br />
-      <span className={styles.geolocation}>
-        {' '}
-        Latitude: {latitude}, Longitude: {longitude}
-      </span>
-    </div>
-  );
-};
diff --git a/lib/typescript/render/renderProviders.ts b/lib/typescript/render/renderProviders.ts
index 0dbefa7f0e..5260a69cae 100644
--- a/lib/typescript/render/renderProviders.ts
+++ b/lib/typescript/render/renderProviders.ts
@@ -1,4 +1,4 @@
-import {FacebookRender} from './providers/facebook/FacebookRender';
+import {MetaRender} from './providers/meta/MetaRender';
 import {ChatPluginRender} from './providers/chatplugin/ChatPluginRender';
 import {GoogleRender} from './providers/google/GoogleRender';
 import {TwilioRender} from './providers/twilio/TwilioRender';
@@ -8,8 +8,9 @@ import {RenderPropsUnion} from './props';
 type Provider = (messageRenderProps: RenderPropsUnion) => JSX.Element;
 
 export const renderProviders: {[key: string]: Provider} = {
-  facebook: FacebookRender,
-  instagram: FacebookRender,
+  facebook: MetaRender,
+  instagram: MetaRender,
+  whatsapp: MetaRender,
   chatplugin: ChatPluginRender,
   'twilio.sms': TwilioRender,
   'twilio.whatsapp': TwilioRender,
diff --git a/lib/typescript/render/services/mediaAttachments.ts b/lib/typescript/render/services/mediaAttachments.ts
index 96a1903a2d..89fee3bddc 100644
--- a/lib/typescript/render/services/mediaAttachments.ts
+++ b/lib/typescript/render/services/mediaAttachments.ts
@@ -75,6 +75,7 @@ export const attachmentsExtensions = {
 };
 
 export const getAttachmentType = (fileName: string, source: string) => {
+  if (!fileName) return;
   const fileNameArr = fileName.split('.');
   const fileNameExtension = fileNameArr[fileNameArr.length - 1].toLowerCase();
 
@@ -103,6 +104,8 @@ export const getAttachmentType = (fileName: string, source: string) => {
 };
 
 export const getFileName = (fileUrl: string) => {
+  if (!fileUrl) return;
+
   const fileUrlArr = fileUrl.split('/');
 
   return fileUrlArr[fileUrlArr.length - 1].split('?')[0];
diff --git a/lib/typescript/render/services/useAnimation.ts b/lib/typescript/render/services/useAnimation.ts
index 4aaf55b784..d20d700da4 100644
--- a/lib/typescript/render/services/useAnimation.ts
+++ b/lib/typescript/render/services/useAnimation.ts
@@ -6,7 +6,13 @@ export const useAnimation = (
   animationState: Dispatch<SetStateAction<boolean>>,
   timeOut: number
 ) => {
-  setTimeout(() => setState(!currentState), timeOut);
-  setTimeout(() => animationState(true), timeOut);
-  animationState(false);
+  new Promise(resolve => {
+    !currentState && setState(true);
+    animationState(!currentState);
+    resolve(true);
+  }).then(() => {
+    setTimeout(() => {
+      setState(!currentState);
+    }, timeOut);
+  });
 };
diff --git a/lib/typescript/translations/translations.ts b/lib/typescript/translations/translations.ts
index 9c3be6703b..1f55353de6 100644
--- a/lib/typescript/translations/translations.ts
+++ b/lib/typescript/translations/translations.ts
@@ -151,6 +151,7 @@ const resources = {
       uninstallComponentText: 'Are you sure you want to uninstall this component?',
       restart: 'Restart',
       restartComponentUpdate: 'We will restart the component to apply your update.',
+      pageUnderConstruction: 'page under construction - coming soon!',
 
       //Channels
       toConfigure: 'To configure',
@@ -193,6 +194,7 @@ const resources = {
       reset: 'Reset',
       preview: 'Preview',
       sample: 'Sample',
+      add: 'Add',
       undoStep: 'Undo',
       deleteChannel: 'Do you really want to delete this channel?',
       addChanne: 'Add channel',
@@ -283,16 +285,39 @@ const resources = {
       installCodeNpm1: 'You can install your ',
       installCodeNpm2: ' library here:',
 
+      //Facebook Messenger
+      inputTooltipFacebookAppId: 'Your Facebook App Id',
+      inputTooltipFacebookAppSecret: 'Your Facebook App Secret',
+      inputTooltipFacebookWebhookSecret: 'Your Facebook Webhook Secret',
+
+      //Google
+      inputTooltipGoogleSaFile: 'Your Google Sa File',
+      inputTooltipGooglePartnerKey: 'Your Google Partner Key',
+
+      //Viber
+      inputTooltipViberAuthToken: 'Your Viber Auth Token',
+
+      //Twilio SMS
+      inputTooltipTwiliosmsAuthToken: 'Your Twilio SMS Auth Token',
+      inputTooltipTwiliosmsAccountSid: 'Your Twilio SMS Account Sid',
+
+      //Whatsapp Business Cloud
+      inputTooltipWhatsappAppId: 'Your Whatsapp App Id',
+      inputTooltipWhatsappAppSecret: 'Your Whatsapp App Secret',
+      inputTooltipWhatsappPhoneNumber: 'Your Phone Number',
+      inputTooltipWhatsappName: 'Your Name',
+      inputTooltipWhatsappAvatarUrl: 'Your Avatar Url',
+
       //Zendesk
       zendeskDescription: 'Make customers happy via text, mobile, phone, email, live chat, social media.',
       ZendeskSubDomain: 'Zendesk Subdomain',
       AddDomain: 'Add domain',
-      ZendeskDomain: 'Your zendesk subdomain',
       username: 'Username',
       AddUsername: 'Add Username',
-      ZendeskUsername: 'Your zendesk username',
-      ZendeskToken: 'A zendesk API token associated to your user',
       APIToken: 'API Token',
+      inputTooltipZendeskDomain: 'Your Zendesk Subdomain',
+      inputTooltipZendeskUsername: 'Your Zendesk Username',
+      inputTooltipZendeskToken: 'A Zendesk API token associated to your user',
 
       //Dialogflow
       dialogflowDescription: 'Conversational AI with virtual agents',
@@ -302,29 +327,35 @@ const resources = {
       AddGoogleApplicationCredentials: 'Add the Google Application Credentials',
       SuggestionConfidenceLevel: 'Suggestion Confidence Level',
       ReplyConfidenceLevel: 'Reply Confidence Level',
-      fromCloudConsole: 'given by the Cloud Console',
-      amountSuggestions: 'amount for suggestions',
-      amountReplies: 'amount for replies',
+      inputTooltipDialogflowProjectId: 'given by the Cloud Console',
+      inputTooltipDialogflowDialogflowCredentials: 'given by the Cloud Console',
+      inputTooltipDialogflowSuggestionConfidenceLevel: 'amount for suggestions',
+      inputTooltipDialogflowReplyConfidenceLevel: 'amount for replies',
       to: 'to',
       processorWaitingTime: 'Processor waiting time',
       processorCheckPeriod: 'Processor check period',
-      waitingDefault: 'Default value: 5000',
-      checkDefault: 'Default value: 2500',
+      inputTooltipDialogflowConnectorStoreMessagesProcessorMaxWaitMillis: 'Default value: 5000',
+      inputTooltipDialogflowConnectorStoreMessagesProcessorCheckPeriodMillis: 'Default value: 2500',
       defaultLanguage: 'Default language',
-      defaultLanguageTooltip: 'Default value: en',
+      inputTooltipDialogflowConnectorDefaultLanguage: 'Default value: en',
 
       //Salesforce
       salesforceDescription:
         "Increase sales performance with the world's No. 1 CRM platform for business of all sizes.",
       salesforceOrgUrl: 'Organization URL',
       yourSalesforceOrgUrl: 'Your Salesforce organization URL',
-      salesforceOrgUrlExample: 'Example: https://org.my.salesforce.com',
       Username: 'Username',
-      yourSalesforceUsername: 'Your Salesforce username',
       Password: 'Password',
-      yourSalesforcePassword: 'Your Salesforce password',
       securityToken: 'Security Token',
-      yourSalesforceSecurityToken: 'Your Salesforce Security Token',
+      inputTooltipSalesforceUrl: 'Example: https://org.my.salesforce.com',
+      inputTooltipSalesforceUsername: 'Your Salesforce Username',
+      inputTooltipSalesforcePassword: 'Your Salesforce Password',
+      inputTooltipSalesforceSecurityToken: 'Your Salesforce Security Token',
+
+      //Rasa
+      inputTooltipRasaWebhookUrl: 'Example: http://webhooks.rasa',
+      inputTooltipRasaApiHost: 'Your Rasa Api Host',
+      inputTooltipRasaToken: 'Your Rasa Token',
 
       //Facebook Messenger
       connectMessenger: 'Connect Messenger',
@@ -339,6 +370,7 @@ const resources = {
 
       //Google Business Messages
       agentId: 'Agent ID',
+      addAgentId: 'Add Agent ID',
       googleAgentPlaceholder: 'Add the agent ID provided by your Google Partner',
       connectGoogle: 'Connect Google Business Messages',
       googleConfigurationText:
@@ -349,6 +381,12 @@ const resources = {
       googleConfigurationText3: 'for more information.',
       newGoogleConnection: 'You are about to connect a new channel',
 
+      //IBM Watson Assistant
+      ibmDescription: 'IBM Watson Assistant uses artificial intelligence that understands customers.',
+
+      //Amazon S3
+      amazons3Description: 'Amazon Simple Storage Service (Amazon S3) is an object storage service.',
+
       //Instagram
       instagramAccount: 'Facebook Page ID connected to the Instagram account',
       instagramAccountPlaceholder: 'Add the Facebook Page ID',
@@ -386,6 +424,9 @@ const resources = {
 
       //WhatsApp Business Cloud
       whatsappDescription: 'World #1 chat app.',
+      whatsappPhoneNumberId: 'Phone Number Id',
+      whatsappPhoneNumberIdPlaceholder: 'Add your Phone Number Id',
+      whatsappPhoneNumberIdTooltip: 'Add your Phone Number Id',
 
       //Congnigy
       congnigyDescription: 'A low-code UI for conversational AI.',
@@ -408,6 +449,9 @@ const resources = {
       //Inbox
       frontendinboxDescription: 'An Inbox to view and organize all your conversations.',
 
+      //AiryContacts
+      airyContactsDescription: 'View and manage contacts for personalized interactions.',
+
       //Connectors
       connectors: 'Connectors',
       noResults: 'Result not found.',
@@ -423,14 +467,23 @@ const resources = {
       noChannelsConnected: 'This connector does not have any connected channels yet.',
       optional: 'Optional',
       configuration: 'Configuration',
-
-      //Rasa
-      rasaWebhookPlaceholder: 'Your Rasa Webhook Url',
-      rasaWebhookTooltip: 'Example: http://webhooks.rasa',
-      rasaApihostPlaceholder: 'Your Rasa Api Host',
-      rasaApihostTooltip: 'Your Rasa Api Host',
-      rasaTokenPlaceholder: 'Your Rasa Token',
-      rasaTokenTooltip: 'Your Rasa Token',
+      createChannel: 'Create Channel',
+
+      //Request Access
+      comingSoon: 'Coming Soon',
+      notifyMe: 'Notify Me',
+      notifyMeRequestSent: 'Requested',
+      infoNotifyMe: 'We will already send a notification to',
+      notifyMeTitle: 'To get back to you',
+      notifyMeSuccessful: 'We got your request. We will get back to you as soon as we process your request',
+      emailCapital: 'Email',
+      addEmail: 'Add email',
+      notifyMeEmailTooltip: 'The email will be used as the request email',
+      addName: 'Add name',
+      notifyMeNameTooltip: 'The name will be used as the request name',
+      addMessage: 'Add message',
+      message: 'Message',
+      send: 'Send',
 
       //Whatsapp Business Cloud
       whatsappBusinessCloudAppIdPlaceholder: 'Your App ID',
@@ -447,6 +500,9 @@ const resources = {
       Free: 'Free',
       Paid: 'Paid',
       ['REQUEST ACCESS']: 'REQUEST ACCESS',
+      searchByNamePlaceholder: 'Search by name',
+      searchByType: 'Search by type',
+      noMatchingCatalogs: 'We could not find a catalog matching your criterias.',
 
       //NotFound
       notFound: `Oops! We couldn't find that here.`,
@@ -638,6 +694,7 @@ const resources = {
       Update: 'Aktualisieren',
       restart: 'Neu starten',
       restartComponentUpdate: 'Wir werden die Komponente neu starten, um Ihr Update anzuwenden.',
+      pageUnderConstruction: 'Seite im Aufbau - kommt bald!',
 
       //Channels
       toConfigure: 'Konfigurieren',
@@ -680,6 +737,7 @@ const resources = {
       reset: 'Zurücksetzen',
       preview: 'Vorschau',
       sample: 'Muster',
+      add: 'Hinzufügen',
       deleteChannel: 'Wollen Sie diesen Kanal wirklich löschen?',
       addChanne: 'Kanal hinzufügen',
       infoButtonText: 'mehr Informationen',
@@ -769,16 +827,39 @@ const resources = {
       installCodeNpm1: 'Sie können Ihre ',
       installCodeNpm2: '-Bibliothek hier installieren:',
 
+      //Facebook Messenger
+      inputTooltipFacebookAppId: 'Ihre Facebook App Id',
+      inputTooltipFacebookAppSecret: 'Ihr Facebook App Secret',
+      inputTooltipFacebookWebhookSecret: 'Ihr Facebook Webhook Secret',
+
+      //Google
+      inputTooltipGoogleSaFile: 'Ihre Google Sa File',
+      inputTooltipGooglePartnerKey: 'Ihr Google Partner Schlüssel',
+
+      //Viber
+      inputTooltipViberAuthToken: 'Ihr Viber Auth Token',
+
+      //Twilio SMS
+      inputTooltipTwiliosmsAuthToken: 'Ihr Twilio SMS Auth Token',
+      inputTooltipTwiliosmsAccountSid: 'Ihr Twilio SMS Account Sid',
+
+      //Whatsapp Business Cloud
+      inputTooltipWhatsappAppId: 'Ihre Whatsapp App Id',
+      inputTooltipWhatsappAppSecret: 'Ihr Whatsapp App Secret',
+      inputTooltipWhatsappPhoneNumber: 'Ihre Handynummer',
+      inputTooltipWhatsappName: 'Ihr Name',
+      inputTooltipWhatsappAvatarUrl: 'Ihre Avatar Url',
+
       //Zendesk
       zendeskDescription: 'Machen Sie Kunden glücklich per SMS, E-Mail, Live-Chat, Social Media.',
       ZendeskSubDomain: 'Zendesk Subdomäne',
       AddDomain: 'Domäne hinzufügen',
-      ZendeskDomain: 'Ihre Zendesk-Subdomäne',
       username: 'Benutzername',
       AddUsername: 'Benutzername hinzufügen',
-      ZendeskUsername: 'Ihr Zendesk Benutzername',
-      ZendeskToken: 'Ihr Zendesk-API-Token',
       APIToken: 'API-Token',
+      inputTooltipZendeskDomain: 'Ihre Zendesk-Subdomäne',
+      inputTooltipZendeskUsername: 'Ihr Zendesk Benutzername',
+      inputTooltipZendeskToken: 'Ihr Zendesk-API-Token',
 
       //Dialogflow
       dialogflowDescription: 'Conversational AI mit virtuellen Agenten',
@@ -804,16 +885,24 @@ const resources = {
         'Steigern Sie die Vertriebsleistung mit der weltweit führenden CRM-Plattform für Unternehmen.',
       salesforceOrgUrl: 'Organisations-URL',
       yourSalesforceOrgUrl: 'Ihre Salesforce-Organisations-URL',
-      salesforceOrgUrlExample: 'Beispiel: https://org.my.salesforce.com',
       Username: 'Benutzername',
-      yourSalesforceUsername: 'Ihr Salesforce-Benutzername',
       Password: 'Passwort',
-      yourSalesforcePassword: 'Ihr Salesforce-Passwort',
       securityToken: 'Sicherheitstoken',
-      yourSalesforceSecurityToken: 'Ihr Salesforce-Sicherheitstoken',
+      inputTooltipSalesforceUrl: 'Beispiel: https://org.my.salesforce.com',
+      inputTooltipSalesforceUsername: 'Ihr Salesforce-Benutzername',
+      inputTooltipSalesforcePassword: 'Ihr Salesforce-Passwort',
+      inputTooltipSalesforceSecurityToken: 'Ihr Salesforce-Sicherheitstoken',
+
+      //Rasa
+      inputTooltipRasaWebhookUrl: 'Beispiel: http://webhooks.rasa',
+      inputTooltipRasaApiHost: 'Ihr Rasa Api Host',
+      inputTooltipRasaToken: 'Ihr Rasa-Token',
 
       //WhatsApp Business Cloud
       whatsappDescription: 'Weltweite Chat-App Nr. 1',
+      whatsappPhoneNumberId: 'Telefonnummer Id',
+      whatsappPhoneNumberIdPlaceholder: 'Telefonnummer Id hinzufügen',
+      whatsappPhoneNumberIdTooltip: 'Telefonnummer Id hinzufügen',
 
       //Congnigy
       congnigyDescription: 'Eine Low-Code-Benutzeroberfläche für Konversations-KI.',
@@ -836,6 +925,9 @@ const resources = {
       //Inbox
       frontendinboxDescription: 'Ein Inbox zum Anzeigen und Organisieren aller Ihrer Konversationen.',
 
+      //AiryContacts
+      airyContactsDescription: 'Anzeigen und Verwalten von Kontakten für personalisierte Interaktionen.',
+
       //Facebook Messenger
       connectMessenger: 'Messenger verbinden',
       facebookConfiguration: 'Die Facebook-Quelle erfordert die folgende Konfiguration:',
@@ -849,6 +941,7 @@ const resources = {
 
       //Google Business Messages
       agentId: 'Agent ID',
+      addAgentId: 'Agent ID hinzufügen',
       googleAgentPlaceholder: 'Fügen Sie die von Ihrem Google-Partner bereitgestellte Agent-ID hinzu',
       connectGoogle: 'Google Business-Nachrichten verbinden',
       googleConfigurationText:
@@ -859,6 +952,12 @@ const resources = {
       googleConfigurationText3: 'für weitere Informationen.',
       newGoogleConnection: 'Sie sind dabei, einen neuen Kanal zu verbinden',
 
+      //IBM Watson Assistant
+      ibmDescription: 'IBM Watson Assistant verwendet künstliche Intelligenz, die den Kunden versteht.',
+
+      //Amazon S3
+      amazons3Description: 'Amazon Simple Storage Service (Amazon S3) ist ein Objektspeicherdienst.',
+
       //Instagram
       instagramAccount: 'Facebook-Seiten-ID, die mit dem Instagram-Konto verbunden ist',
       instagramAccountPlaceholder: 'Hinzufügen der Facebook-Seiten-ID',
@@ -909,14 +1008,24 @@ const resources = {
       noChannelsConnected: 'Mit diesem Anschluss sind noch keine Kanäle verbunden.',
       optional: 'Optional',
       configuration: 'Konfiguration',
-
-      //Rasa
-      rasaWebhookPlaceholder: 'Ihre Rasa Webhook Url',
-      rasaWebhookTooltip: 'Beispiel: http://webhooks.rasa',
-      rasaApihostPlaceholder: 'Ihr Rasa Api Host',
-      rasaApihostTooltip: 'Ihr Rasa Api-Host',
-      rasaTokenPlaceholder: 'Ihr Rasa Token',
-      rasaTokenTooltip: 'Ihr Rasa-Token',
+      createChannel: 'Kanal erstellen',
+
+      //Request Access
+
+      comingSoon: 'Bald verfügbar',
+      notifyMe: 'Informier mich',
+      notifyMeRequestSent: 'Angefordert',
+      infoNotifyMe: 'Wir senden bereits eine Benachrichtigung an',
+      notifyMeTitle: 'Um auf Sie zurück zu kommen',
+      notifyMeSuccessful:
+        'Wir haben Ihre Anfrage erhalten. Wir werden uns mit Ihnen in Verbindung setzen, sobald wir Ihre Anfrage bearbeitet haben',
+      addEmail: 'E-Mail hinzufügen',
+      notifyMeEmailTooltip: 'Die E-Mail wird als Anfrage-E-Mail verwendet.',
+      addName: 'Name hinzufügen',
+      notifyMeNameTooltip: 'Der Name wird als Name der Anfrage verwendet.',
+      addMessage: 'Nachricht hinzufügen',
+      message: 'Nachricht',
+      send: 'Senden',
 
       //Whatsapp Business Cloud
       whatsappBusinessCloudAppIdPlaceholder: 'Ihre App ID',
@@ -933,6 +1042,9 @@ const resources = {
       Free: 'Kostenlos',
       Paid: 'Kostenpflichtig',
       ['REQUEST ACCESS']: 'ANFRAGE ZUGANG',
+      searchByNamePlaceholder: 'Suche nach Name',
+      searchByType: 'Suche nach Typ',
+      noMatchingCatalogs: 'Wir konnten keinen Catalog finden, der Ihren Kriterien entspricht.',
 
       //NotFound
       notFound: 'Huch! Das konnten wir hier nicht finden.',
@@ -1116,6 +1228,7 @@ const resources = {
       Update: 'Mettre à jour',
       restart: 'Redémarrer',
       restartComponentUpdate: 'Nous allons redémarrer le composant pour appliquer votre mise à jour.',
+      pageUnderConstruction: 'page en construction - bientôt disponible !',
 
       //Channels
       toConfigure: 'configuration',
@@ -1158,6 +1271,7 @@ const resources = {
       reset: 'Réinitialiser',
       preview: 'Aperçu',
       sample: 'Echantillon',
+      add: 'Ajouter',
       deleteChannel: 'Voulez-vous vraiment supprimer ce canal?',
       addChanne: 'Ajouter un canal',
       infoButtonText: `plus d'informations`,
@@ -1231,16 +1345,39 @@ const resources = {
       installCustomize: 'Installation et personnalisation',
       addLiveChatToWebsite: 'Ajoutez Airy Live Chat à votre site web et à votre application.',
 
+      //Facebook Messenger
+      inputTooltipFacebookAppId: 'Ton Facebook App Id',
+      inputTooltipFacebookAppSecret: 'Ton Facebook App Secret',
+      inputTooltipFacebookWebhookSecret: 'Ton Facebook Webhook Secret',
+
+      //Google
+      inputTooltipGoogleSaFile: 'Ton Google Sa File',
+      inputTooltipGooglePartnerKey: 'Ton Google Partner Key',
+
+      //Viber
+      inputTooltipViberAuthToken: 'Ton Viber Auth Token',
+
+      //Twilio SMS
+      inputTooltipTwiliosmsAuthToken: 'Ton Twilio SMS Auth Token',
+      inputTooltipTwiliosmsAccountSid: 'Ton Twilio SMS Account Sid',
+
+      //Whatsapp Business Cloud
+      inputTooltipWhatsappAppId: 'Votre Whatsapp App Id',
+      inputTooltipWhatsappAppSecret: 'Votre Whatsapp App Secret',
+      inputTooltipWhatsappPhoneNumber: 'Votre numéro de téléphone',
+      inputTooltipWhatsappName: 'Votre nom',
+      inputTooltipWhatsappAvatarUrl: 'Votre Avatar Url',
+
       //Zendesk
       zendeskDescription: "Un service client d'excellence par SMS, e-mail, chat, réseaux sociaux.",
       ZendeskSubDomain: 'Sous-domaine Zendesk',
       AddDomain: 'Ajouter un domaine',
-      ZendeskDomain: 'Ton sous-domaine Zendesk',
       username: "Nom d'utilisateur",
       AddUsername: "Ajouter un nom d'utilisateur",
-      ZendeskUsername: "Ton nom d'utilisateur Zendesk",
-      ZendeskToken: 'Un token API Zendesk associée à ton utilisateur',
       APIToken: 'Token API',
+      inputTooltipZendeskDomain: 'Ton sous-domaine Zendesk',
+      inputTooltipZendeskUsername: `Ton nom d'utilisateur Zendesk`,
+      inputTooltipZendeskToken: 'Un token API Zendesk associée à ton utilisateur',
 
       //Dialogflow
       dialogflowDescription: "Des conversations d'IA avec des agents virtuels",
@@ -1266,13 +1403,13 @@ const resources = {
       salesforceDescription: 'Augmentez vos performances commerciales avec la plateforme CRM n° 1 au monde.',
       salesforceOrgUrl: 'URL',
       yourSalesforceOrgUrl: 'URL Salesforce de votre organisation',
-      salesforceOrgUrlExample: 'Exemple : https://org.my.salesforce.com',
       Username: "Nom d'utilisateur",
-      yourSalesforceUsername: "Nom d'utilisateur Salesforce",
       Password: 'Mot de passe',
-      yourSalesforcePassword: 'Mot de passe Salesforce',
       securityToken: 'Jeton de sécurité',
-      yourSalesforceSecurityToken: 'Jeton de sécurité Salesforce',
+      inputTooltipSalesforceUrl: 'Exemple : https://org.my.salesforce.com',
+      inputTooltipSalesforceUsername: "Nom d'utilisateur Salesforce",
+      inputTooltipSalesforcePassword: 'Mot de passe Salesforce',
+      inputTooltipSalesforceSecurityToken: 'Jeton de sécurité Salesforce',
 
       //Facebook Messenger
       facebookPageId: 'ID de la page Facebook',
@@ -1304,6 +1441,7 @@ const resources = {
 
       //Google Business Messages
       agentId: `ID de l'agent`,
+      addAgentId: `Ajouter l'ID de l'agent`,
       googleAgentPlaceholder: `Ajoutez l'identifiant de l'agent fourni par votre partenaire Google`,
       connectGoogle: 'Connecter les messages Google Business',
       googleConfigurationText:
@@ -1314,6 +1452,12 @@ const resources = {
       googleConfigurationText3: `pour plus d'informations.`,
       newGoogleConnection: 'Vous êtes sur le point de connecter un nouveau canal',
 
+      //IBM Watson Assistant
+      ibmDescription: `L'assistant IBM Watson utilise une intelligence artificielle qui comprend les clients.`,
+
+      //Amazon S3
+      amazons3Description: `Amazon Simple Storage Service (Amazon S3) est un service de stockage d'objets.`,
+
       //Instagram
       instagramAccount: 'ID de la page Facebook connectée au compte Instagram',
       instagramAccountPlaceholder: `Ajoutez l'ID de la page Facebook`,
@@ -1350,6 +1494,9 @@ const resources = {
 
       //WhatsApp Business Cloud
       whatsappDescription: 'Première application de chat au monde',
+      whatsappPhoneNumberId: 'Numéro de téléphone',
+      whatsappPhoneNumberIdPlaceholder: 'Ajoutez votre numéro de téléphone',
+      whatsappPhoneNumberIdTooltip: 'Ajoutez votre numéro de téléphone',
 
       //Congnigy
       congnigyDescription: "Une interface utilisateur low-code pour l'IA conversationnelle.",
@@ -1372,6 +1519,9 @@ const resources = {
       //Inbox
       frontendinboxDescription: 'Une boîte de réception pour afficher et organiser toutes vos conversations.',
 
+      //AiryContacts
+      airyContactsDescription: 'Un outil de gestion de contacts pour des conversations personnalisées',
+
       //Connectors
       connectors: 'Connecteurs',
       noResults: 'Résultat non trouvé.',
@@ -1387,6 +1537,23 @@ const resources = {
       noChannelsConnected: "Ce connecteur n'a pas encore de canaux connectés.",
       optional: 'Optionnel',
       configuration: 'Configuration',
+      createChannel: 'Créer un canal',
+
+      //Request Access
+      comingSoon: 'Prochainement',
+      notifyMe: 'Notifiez-moi',
+      notifyMeRequestSent: 'Demandé',
+      infoNotifyMe: 'Nous allons déjà envoyer une notification à',
+      notifyMeTitle: 'Pour vous recontacter',
+      notifyMeSuccessful:
+        'Nous avons reçu votre demande. Nous vous contacterons dès que nous aurons traité votre demande',
+      addEmail: 'Ajouter un e-mail',
+      notifyMeEmailTooltip: `L'email sera utilisé comme email de demande`,
+      addName: 'Ajouter un nom',
+      notifyMeNameTooltip: 'Le nom sera utilisé comme nom de la demande',
+      addMessage: 'Ajouter un message',
+      message: 'Message',
+      send: 'Envoyer',
 
       //Rasa
       rasaWebhookPlaceholder: 'URL Webhook de Rasa',
@@ -1411,6 +1578,9 @@ const resources = {
       Free: 'Gratuit',
       Paid: 'Payant',
       ['REQUEST ACCESS']: "DEMANDE D'ACCÈS",
+      searchByNamePlaceholder: 'Recherche par nom',
+      searchByType: 'Recherche par type',
+      noMatchingCatalogs: `Nous n'avons pas pu trouver de Catalog correspondant à vos critères.`,
 
       //NotFound
       notFound: 'Oups! Page non trouvée.',
@@ -1598,6 +1768,7 @@ const resources = {
       Update: 'Actualizar',
       restart: 'Reiniciar',
       restartComponentUpdate: 'Reiniciaremos el componente para aplicar su actualización.',
+      pageUnderConstruction: 'página en construcción - próximamente!',
 
       //Channels
       toConfigure: 'configurar',
@@ -1640,6 +1811,7 @@ const resources = {
       reset: 'Restablecer',
       preview: 'Vista previa',
       sample: 'Muestra',
+      add: 'Añadir',
       deleteChannel: '¿Realmente quieres borrar este canal?',
       addChanne: 'Añadir canal',
       infoButtonText: 'más información',
@@ -1729,17 +1901,40 @@ const resources = {
       installCodeNpm1: 'Puede instalar su biblioteca ',
       installCodeNpm2: ' aquí:',
 
+      //Facebook Messenger
+      inputTooltipFacebookAppId: 'Tu Facebook App Id',
+      inputTooltipFacebookAppSecret: 'Tu Facebook App Secret',
+      inputTooltipFacebookWebhookSecret: 'Tu Facebook Webhook Secret',
+
+      //Google
+      inputTooltipGoogleSaFile: 'Tu Google Sa File',
+      inputTooltipGooglePartnerKey: 'Tu Google Partner Key',
+
+      //Viber
+      inputTooltipViberAuthToken: 'Tu Viber Auth Token',
+
+      //Twilio SMS
+      inputTooltipTwiliosmsAuthToken: 'Tu Twilio SMS Auth Token',
+      inputTooltipTwiliosmsAccountSid: 'Tu Twilio SMS Account Sid',
+
+      //Whatsapp Business Cloud
+      inputTooltipWhatsappAppId: 'Su Id. de aplicación de Whatsapp',
+      inputTooltipWhatsappAppSecret: 'El secreto de tu aplicación de Whatsapp',
+      inputTooltipWhatsappPhoneNumber: 'Su número de teléfono',
+      inputTooltipWhatsappName: 'Su nombre',
+      inputTooltipWhatsappAvatarUrl: 'La url de su avatar',
+
       //Zendesk
       zendeskDescription:
         'Mantén a tus clientes satisfechos a través de mensajes de texto, correos electrónicos, chat en vivo.',
       ZendeskSubDomain: 'subdominio Zendesk',
       AddDomain: 'Añadir el subdominio',
-      ZendeskDomain: 'Tu subdominio Zendesk',
       username: 'nombre de usuario',
       AddUsername: 'Añadir el nombre de usuario',
-      ZendeskUsername: 'Tu nombre de usuario Zendesk',
-      ZendeskToken: 'Un token de API Zendesk asociado a tu usuario',
       APIToken: 'Token de API',
+      inputTooltipZendeskDomain: 'Tu subdominio Zendesk',
+      inputTooltipZendeskUsername: `Tu nombre de usuario Zendesk`,
+      inputTooltipZendeskToken: 'Un token de API Zendesk asociado a tu usuario',
 
       //Dialogflow
       dialogflowDescription: 'IA conversacional con agentes virtuales',
@@ -1764,13 +1959,13 @@ const resources = {
       salesforceDescription: 'Aumente sus resultados de ventas con la plataforma de CRM n.º 1 del mundo.',
       salesforceOrgUrl: 'URL de la organización',
       yourSalesforceOrgUrl: 'La URL de su organización de Salesforce',
-      salesforceOrgUrlExample: 'Ejemplo: https://org.my.salesforce.com',
       Username: 'Nombre de usuario',
-      yourSalesforceUsername: 'Su nombre de usuario de Salesforce',
       Password: 'Contraseña',
-      yourSalesforcePassword: 'Su contraseña de Salesforce',
       securityToken: 'Token de seguridad',
-      yourSalesforceSecurityToken: 'Su token de seguridad de Salesforce',
+      inputTooltipSalesforceUrl: 'Ejemplo: https://org.my.salesforce.com',
+      inputTooltipSalesforceUsername: 'Su nombre de usuario de Salesforce',
+      inputTooltipSalesforcePassword: 'Su contraseña de Salesforce',
+      inputTooltipSalesforceSecurityToken: 'Su token de seguridad de Salesforce',
 
       //Facebook Messenger
       connectMessenger: 'Conectar con Messenger',
@@ -1785,6 +1980,7 @@ const resources = {
 
       //Google Business Messages
       agentId: 'Identificación del agente',
+      addAgentId: 'Añadir ID de agente',
       googleAgentPlaceholder: 'Añade el ID de agente proporcionado por tu Google Partner',
       connectGoogle: 'Conectar los mensajes de Google Business',
       googleConfigurationText:
@@ -1795,6 +1991,12 @@ const resources = {
       googleConfigurationText3: 'para más información.',
       newGoogleConnection: 'Estás a punto de conectar un nuevo canal',
 
+      //IBM Watson Assistant
+      ibmDescription: 'El Asistente Watson de IBM utiliza inteligencia artificial que entiende a los clientes.',
+
+      //Amazon S3
+      amazons3Description: 'Amazon Simple Storage Service (Amazon S3) es un servicio de almacenamiento de objetos.',
+
       //Instagram
       instagramAccount: 'ID de la página de Facebook conectada a la cuenta de Instagram',
       instagramAccountPlaceholder: 'Añade el ID de la página de Facebook',
@@ -1832,6 +2034,9 @@ const resources = {
 
       //WhatsApp Business Cloud
       whatsappDescription: 'La aplicación de mensajería número 1 del mundo',
+      whatsappPhoneNumberId: 'Número de teléfono Id',
+      whatsappPhoneNumberIdPlaceholder: 'Añada su número de teléfono',
+      whatsappPhoneNumberIdTooltip: 'Añada su número de teléfono',
 
       //Congnigy
       congnigyDescription: 'Una interfaz de usuario de código bajo para IA conversacional.',
@@ -1854,6 +2059,9 @@ const resources = {
       //Inbox
       frontendinboxDescription: 'Una bandeja de entrada para ver y organizar todas tus conversaciones.',
 
+      //AiryContacts
+      airyContactsDescription: 'Administre contactos para interacciones personalizadas.',
+
       //Connectors
       connectors: 'Conectores',
       noResults: 'Resultado no encontrado.',
@@ -1869,6 +2077,23 @@ const resources = {
       noChannelsConnected: 'Este conector aún no tiene ningún canal conectado.',
       optional: 'Opcional',
       configuration: 'Configuración',
+      createChannel: 'Crear canal',
+
+      //Request Access
+      comingSoon: 'Próximamente',
+      notifyMe: 'Notificarme',
+      notifyMeRequestSent: 'Solicitado',
+      infoNotifyMe: 'Ya enviaremos una notificación a',
+      notifyMeTitle: 'Para volver a llamarte',
+      notifyMeSuccessful:
+        'Hemos recibido su solicitud. Nos pondremos en contacto con usted en cuanto procesemos su solicitud',
+      addEmail: 'Añadir correo electrónico',
+      notifyMeEmailTooltip: 'En este correo electrónico se notificará su solicitud',
+      addName: 'Añadir nombre',
+      notifyMeNameTooltip: 'El nombre se utilizará como nombre de la solicitud',
+      addMessage: 'Añadir mensaje',
+      message: 'Mensaje',
+      send: 'Enviar',
 
       //Rasa
       rasaWebhookPlaceholder: 'Su Url de Rasa Webhook',
@@ -1893,6 +2118,9 @@ const resources = {
       Free: 'Gratis',
       Paid: 'Premium',
       ['REQUEST ACCESS']: 'SOLICITAR ACCESO',
+      searchByNamePlaceholder: 'Buscar por nombre',
+      searchByType: 'Buscar por tipo',
+      noMatchingCatalogs: 'No hemos podido encontrar un catálogo que coincida con sus criterios.',
 
       //NotFound
       notFound: '¡Uy! No pudimos encontrarlo aquí.',
diff --git a/lib/typescript/websocketclient/index.ts b/lib/typescript/websocketclient/index.ts
index f86c0511bc..1c326f4503 100644
--- a/lib/typescript/websocketclient/index.ts
+++ b/lib/typescript/websocketclient/index.ts
@@ -1,8 +1,7 @@
 import {StompWrapper} from './stompWrapper';
 import {Message, Channel, MetadataEvent, Tag} from 'model';
 import {EventPayload} from './payload';
-/* eslint-disable @typescript-eslint/no-var-requires */
-const camelcaseKeys = require('camelcase-keys');
+import camelcaseKeys from 'camelcase-keys';
 
 type CallbackMap = {
   onMessage?: (conversationId: string, channelId: string, message: Message) => void;
diff --git a/lib/typescript/websocketclient/payload.ts b/lib/typescript/websocketclient/payload.ts
index 48e4cea269..7037a5dd3d 100644
--- a/lib/typescript/websocketclient/payload.ts
+++ b/lib/typescript/websocketclient/payload.ts
@@ -15,6 +15,12 @@ export interface MessageCreatedPayload extends Event {
       delivery_state: DeliveryState;
       from_contact: boolean;
       sent_at: Date;
+      source: Source;
+      sender: {
+        id: string;
+        name?: string;
+        avatar_url?: string;
+      };
     };
   };
 }
@@ -42,7 +48,7 @@ export interface ChannelUpdatedPayload extends Event {
   type: 'channel.updated';
   payload: {
     id: string;
-    metadata?: Metadata & {
+    metadata: Metadata & {
       name: string;
       image_url?: string;
     };
diff --git a/package.json b/package.json
index 263b291393..1ba3871674 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@emoji-mart/data": "^1.0.5",
+    "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@reduxjs/toolkit": "^1.8.5",
@@ -12,26 +12,26 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/jest": "^28.1.7",
     "audio-recorder-polyfill": "^0.4.1",
-    "camelcase-keys": "^7.0.2",
-    "core-js": "3.25.0",
-    "emoji-mart": "^5.2.1",
+    "camelcase-keys": "^8.0.2",
+    "core-js": "3.25.5",
+    "emoji-mart": "^5.2.2",
     "form-data": "^4.0.0",
-    "i18next": "^21.9.1",
+    "i18next": "^21.9.2",
     "isomorphic-fetch": "^3.0.0",
     "linkify-react": "^3.0.4",
     "linkifyjs": "^3.0.5",
     "lodash-es": "^4.17.21",
-    "preact": "^10.10.6",
+    "preact": "^10.11.0",
     "react": "18.2.0",
     "react-autosize-textarea": "^7.1.0",
     "react-color": "^2.19.3",
     "react-dom": "18.2.0",
-    "react-i18next": "^11.18.5",
+    "react-i18next": "^11.18.6",
     "react-markdown": "^8.0.2",
     "react-modal": "^3.14.4",
     "react-redux": "8.0.2",
     "react-refresh": "^0.14.0",
-    "react-router-dom": "6.3.0",
+    "react-router-dom": "6.4.1",
     "redux": "^4.2.0",
     "regenerator-runtime": "^0.13.9",
     "reselect": "4.1.6",
@@ -40,23 +40,23 @@
     "typesafe-actions": "^5.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.18.13",
+    "@babel/core": "7.19.3",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
-    "@babel/plugin-transform-spread": "^7.18.9",
-    "@babel/preset-env": "^7.18.10",
+    "@babel/plugin-transform-spread": "^7.19.0",
+    "@babel/preset-env": "^7.19.3",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
-    "@bazel/typescript": "5.5.3",
+    "@bazel/typescript": "5.6.0",
     "@hot-loader/react-dom": "^17.0.2",
     "@svgr/plugin-svgo": "^6.3.1",
-    "@svgr/webpack": "^6.3.1",
-    "@testing-library/dom": "^8.17.1",
-    "@testing-library/react": "13.3.0",
-    "@types/dom-mediacapture-record": "^1.0.11",
+    "@svgr/webpack": "^6.4.0",
+    "@testing-library/dom": "^8.18.1",
+    "@testing-library/react": "13.4.0",
+    "@types/dom-mediacapture-record": "^1.0.13",
     "@types/lodash-es": "^4.17.6",
-    "@types/node": "18.7.13",
-    "@types/react": "18.0.17",
+    "@types/node": "18.8.2",
+    "@types/react": "18.0.21",
     "@types/react-dom": "18.0.6",
     "@types/react-redux": "7.1.24",
     "@types/react-router-dom": "^5.3.3",
@@ -64,35 +64,35 @@
     "@types/resize-observer-browser": "^0.1.7",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.32.0",
-    "babel-jest": "^29.0.1",
+    "babel-jest": "^29.1.2",
     "babel-loader": "^8.2.5",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
-    "cypress": "10.6.0",
+    "cypress": "10.9.0",
     "dotenv-webpack": "^8.0.1",
     "eslint": "^7.32.0",
-    "eslint-plugin-react": "^7.31.1",
+    "eslint-plugin-react": "^7.31.8",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^28.1.3",
-    "jest-environment-jsdom": "^29.0.1",
+    "jest-environment-jsdom": "^29.1.2",
     "minimist": "^1.2.6",
     "prettier": "^2.7.1",
     "react-hot-loader": "^4.13.0",
     "react-test-renderer": "^18.2.0",
-    "sass": "^1.54.5",
+    "sass": "^1.55.0",
     "sass-loader": "^13.0.2",
     "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.3.5",
-    "typescript": "^4.8.2",
+    "terser-webpack-plugin": "^5.3.6",
+    "typescript": "^4.8.4",
     "url-loader": "^4.1.1",
     "webpack": "^5.74.0",
     "webpack-bundle-analyzer": "^4.6.1",
     "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.10.1"
+    "webpack-dev-server": "^4.11.1"
   },
   "resolutions": {
-    "@types/react": "18.0.17"
+    "@types/react": "18.0.21"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c5d4277611..b3524153e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29,38 +29,38 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
-  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.3":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.3.tgz#707b939793f867f5a73b2666e6d9a3396eb03151"
+  integrity sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw==
 
-"@babel/core@7.18.13", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.5":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac"
-  integrity sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==
+"@babel/core@7.19.3", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.5":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz#2519f62a51458f43b682d61583c3810e7dcee64c"
+  integrity sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.13"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.13"
+    "@babel/generator" "^7.19.3"
+    "@babel/helper-compilation-targets" "^7.19.3"
+    "@babel/helper-module-transforms" "^7.19.0"
+    "@babel/helpers" "^7.19.0"
+    "@babel/parser" "^7.19.3"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.18.13"
-    "@babel/types" "^7.18.13"
+    "@babel/traverse" "^7.19.3"
+    "@babel/types" "^7.19.3"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.18.13", "@babel/generator@^7.7.2":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212"
-  integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==
+"@babel/generator@^7.19.3", "@babel/generator@^7.7.2":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.3.tgz#d7f4d1300485b4547cb6f94b27d10d237b42bf59"
+  integrity sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==
   dependencies:
-    "@babel/types" "^7.18.13"
+    "@babel/types" "^7.19.3"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
@@ -79,14 +79,14 @@
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.6"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
-  integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0", "@babel/helper-compilation-targets@^7.19.3":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz#a10a04588125675d7c7ae299af86fa1b2ee038ca"
+  integrity sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
+    "@babel/compat-data" "^7.19.3"
     "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.20.2"
+    browserslist "^4.21.3"
     semver "^6.3.0"
 
 "@babel/helper-create-class-features-plugin@^7.18.6":
@@ -110,10 +110,18 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073"
-  integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==
+"@babel/helper-create-regexp-features-plugin@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b"
+  integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.1.0"
+
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
@@ -155,6 +163,14 @@
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.9"
 
+"@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
+
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
@@ -183,19 +199,19 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
-  integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30"
+  integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-module-imports" "^7.18.6"
     "@babel/helper-simple-access" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
     "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
@@ -204,10 +220,10 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
-  integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
+  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
 
 "@babel/helper-remap-async-to-generator@^7.18.6":
   version "7.18.6"
@@ -287,6 +303,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
   integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
 
+"@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
@@ -312,14 +333,14 @@
     "@babel/traverse" "^7.18.11"
     "@babel/types" "^7.18.10"
 
-"@babel/helpers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
-  integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
+"@babel/helpers@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18"
+  integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
 
 "@babel/highlight@^7.10.4":
   version "7.17.12"
@@ -339,10 +360,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.13":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
-  integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.19.3":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a"
+  integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
@@ -360,13 +381,13 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952"
-  integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==
+"@babel/plugin-proposal-async-generator-functions@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz#34f6f5174b688529342288cd264f80c9ea9fb4a7"
+  integrity sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
@@ -659,16 +680,17 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-classes@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da"
-  integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==
+"@babel/plugin-transform-classes@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20"
+  integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.19.0"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-replace-supers" "^7.18.9"
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
@@ -680,10 +702,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz#68906549c021cb231bee1db21d3b5b095f8ee292"
-  integrity sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==
+"@babel/plugin-transform-destructuring@^7.18.13":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5"
+  integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
@@ -759,14 +781,14 @@
     "@babel/helper-simple-access" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06"
-  integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==
+"@babel/plugin-transform-modules-systemjs@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz#5f20b471284430f02d9c5059d9b9a16d4b085a1f"
+  integrity sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==
   dependencies:
     "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-module-transforms" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-validator-identifier" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
@@ -778,13 +800,13 @@
     "@babel/helper-module-transforms" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d"
-  integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888"
+  integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-transform-new-target@^7.18.6":
   version "7.18.6"
@@ -877,12 +899,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664"
-  integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
 "@babel/plugin-transform-sticky-regex@^7.18.6":
@@ -930,18 +952,18 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/preset-env@^7.18.10", "@babel/preset-env@^7.18.2":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
-  integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
+"@babel/preset-env@^7.18.2", "@babel/preset-env@^7.19.3":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.3.tgz#52cd19abaecb3f176a4ff9cc5e15b7bf06bec754"
+  integrity sha512-ziye1OTc9dGFOAXSWKUqQblYHNlBOaDl8wzqf2iKXJAltYiR3hKHUKmkt+S9PppW7RQpq4fFCrwwpIDj/f5P4w==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/compat-data" "^7.19.3"
+    "@babel/helper-compilation-targets" "^7.19.3"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.18.10"
+    "@babel/plugin-proposal-async-generator-functions" "^7.19.1"
     "@babel/plugin-proposal-class-properties" "^7.18.6"
     "@babel/plugin-proposal-class-static-block" "^7.18.6"
     "@babel/plugin-proposal-dynamic-import" "^7.18.6"
@@ -975,9 +997,9 @@
     "@babel/plugin-transform-async-to-generator" "^7.18.6"
     "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
     "@babel/plugin-transform-block-scoping" "^7.18.9"
-    "@babel/plugin-transform-classes" "^7.18.9"
+    "@babel/plugin-transform-classes" "^7.19.0"
     "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.18.13"
     "@babel/plugin-transform-dotall-regex" "^7.18.6"
     "@babel/plugin-transform-duplicate-keys" "^7.18.9"
     "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
@@ -987,9 +1009,9 @@
     "@babel/plugin-transform-member-expression-literals" "^7.18.6"
     "@babel/plugin-transform-modules-amd" "^7.18.6"
     "@babel/plugin-transform-modules-commonjs" "^7.18.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.18.9"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.0"
     "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
     "@babel/plugin-transform-new-target" "^7.18.6"
     "@babel/plugin-transform-object-super" "^7.18.6"
     "@babel/plugin-transform-parameters" "^7.18.8"
@@ -997,18 +1019,18 @@
     "@babel/plugin-transform-regenerator" "^7.18.6"
     "@babel/plugin-transform-reserved-words" "^7.18.6"
     "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.18.9"
+    "@babel/plugin-transform-spread" "^7.19.0"
     "@babel/plugin-transform-sticky-regex" "^7.18.6"
     "@babel/plugin-transform-template-literals" "^7.18.9"
     "@babel/plugin-transform-typeof-symbol" "^7.18.9"
     "@babel/plugin-transform-unicode-escapes" "^7.18.10"
     "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.10"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
-    core-js-compat "^3.22.1"
+    "@babel/types" "^7.19.3"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -1043,7 +1065,7 @@
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-transform-typescript" "^7.18.6"
 
-"@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.18.3"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
   integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
@@ -1059,45 +1081,45 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.2":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68"
-  integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==
+"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.3", "@babel/traverse@^7.7.2":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.3.tgz#3a3c5348d4988ba60884e8494b0592b2f15a04b4"
+  integrity sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.13"
+    "@babel/generator" "^7.19.3"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.13"
-    "@babel/types" "^7.18.13"
+    "@babel/parser" "^7.19.3"
+    "@babel/types" "^7.19.3"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.4", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a"
-  integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
+"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.4", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.3.tgz#fc420e6bbe54880bce6779ffaf315f5e43ec9624"
+  integrity sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==
   dependencies:
     "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@bazel/typescript@5.5.3":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-5.5.3.tgz#3505f92c0bb9598e7ef090dec75f52a1eceab26b"
-  integrity sha512-DGlzz2RmzRrNWhoL1ynr62qsTk5cUzjIJj2MreeQVoYHQZfB3FCCu/TGtDS5xyEbfWhsn7Zwo5qpOxvdYiPWng==
+"@bazel/typescript@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-5.6.0.tgz#4fa0fce58ff23391a93819a329e5513978830df7"
+  integrity sha512-XIi9whWnG3ky3aWz2+w1GLbjKjVdMttsEHi7kqlE2H6KL6Ujq+bvYPUQyNtDVmJOwY4vUJ2TtdebDzfP7H+r2w==
   dependencies:
-    "@bazel/worker" "5.5.3"
+    "@bazel/worker" "5.6.0"
     semver "5.6.0"
     source-map-support "0.5.9"
     tsutils "3.21.0"
 
-"@bazel/worker@5.5.3":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-5.5.3.tgz#3c23135a4e9d6c8ef05f1de85bc3c0c30df2ad38"
-  integrity sha512-Wm0istBBko5w2ddDwCK4rvDQrWfeFGaWdG3iTNkYAHKfQrkgYeMucMoAbFB6LZ87KZKuBEN9KSDq+fi8MXtGlw==
+"@bazel/worker@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-5.6.0.tgz#9ad631a0c7429baeaeb800f03ef1e79630e4f8d9"
+  integrity sha512-3U//HQSeTu6kp6e1k/ncPodTj2IZfJCTNH7dL5VzBzXOodyWivudDMCss3X+LRL8KfjiPqPukysRvwzK/INxhg==
   dependencies:
     google-protobuf "^3.6.1"
 
@@ -1155,10 +1177,10 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@emoji-mart/data@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.0.5.tgz#62c837f1384eb2f94bec4c0dcfe8d230cc67e81d"
-  integrity sha512-HulW+jI7w3ghqRN4+i1LZYJ04bdsMJg5fJ7dr6rlVpsIYKmhpVA7/ACl9R3OB5aoMf8dqNdXftVss8qHCoOi+g==
+"@emoji-mart/data@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.0.6.tgz#68f71be5e023653a3f9f73f4beadfd50848e2131"
+  integrity sha512-8wu3ec/kLCB0Y3K+pOKyY6Ob+xtQu3XhZvntdrpOTUQZ/PO6FW5PpFw7RE1kQ/up1fsVSJBl5mZ8Gs4SPwTYeg==
 
 "@emoji-mart/react@^1.0.1":
   version "1.0.1"
@@ -1281,15 +1303,15 @@
     "@types/node" "*"
     jest-mock "^28.1.3"
 
-"@jest/environment@^29.0.1":
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.0.1.tgz#d236ce9e906744ac58bfc59ae6f7c9882ace7927"
-  integrity sha512-iLcFfoq2K6DAB+Mc+2VNLzZVmHdwQFeSqvoM/X8SMON6s/+yEi1iuRX3snx/JfwSnvmiMXjSr0lktxNxOcqXYA==
+"@jest/environment@^29.1.2":
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.1.2.tgz#bb51a43fce9f960ba9a48f0b5b556f30618ebc0a"
+  integrity sha512-rG7xZ2UeOfvOVzoLIJ0ZmvPl4tBEQ2n73CZJSlzUjPw4or1oSWC0s0Rk0ZX+pIBJ04aVr6hLWFn1DFtrnf8MhQ==
   dependencies:
-    "@jest/fake-timers" "^29.0.1"
-    "@jest/types" "^29.0.1"
+    "@jest/fake-timers" "^29.1.2"
+    "@jest/types" "^29.1.2"
     "@types/node" "*"
-    jest-mock "^29.0.1"
+    jest-mock "^29.1.2"
 
 "@jest/expect-utils@^28.1.3":
   version "28.1.3"
@@ -1318,17 +1340,17 @@
     jest-mock "^28.1.3"
     jest-util "^28.1.3"
 
-"@jest/fake-timers@^29.0.1":
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.0.1.tgz#51ba7a82431db479d4b828576c139c4c0dc5e409"
-  integrity sha512-XZ+kAhLChVQ+KJNa5034p7O1Mz3vtWrelxDcMoxhZkgqmWDaEQAW9qJeutaeCfPvwaEwKYVyKDYfWpcyT8RiMw==
+"@jest/fake-timers@^29.1.2":
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.1.2.tgz#f157cdf23b4da48ce46cb00fea28ed1b57fc271a"
+  integrity sha512-GppaEqS+QQYegedxVMpCe2xCXxxeYwQ7RsNx55zc8f+1q1qevkZGKequfTASI7ejmg9WwI+SJCrHe9X11bLL9Q==
   dependencies:
-    "@jest/types" "^29.0.1"
+    "@jest/types" "^29.1.2"
     "@sinonjs/fake-timers" "^9.1.2"
     "@types/node" "*"
-    jest-message-util "^29.0.1"
-    jest-mock "^29.0.1"
-    jest-util "^29.0.1"
+    jest-message-util "^29.1.2"
+    jest-mock "^29.1.2"
+    jest-util "^29.1.2"
 
 "@jest/globals@^28.1.3":
   version "28.1.3"
@@ -1434,22 +1456,22 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.1"
 
-"@jest/transform@^29.0.1":
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.0.1.tgz#fdaa5d9e135c9bd7addbe65bedd1f15ad028cc7e"
-  integrity sha512-6UxXtqrPScFdDhoip8ys60dQAIYppQinyR87n9nlasR/ZnFfJohKToqzM29KK4gb9gHRv5oDFChdqZKE0SIhsg==
+"@jest/transform@^29.1.2":
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.1.2.tgz#20f814696e04f090421f6d505c14bbfe0157062a"
+  integrity sha512-2uaUuVHTitmkx1tHF+eBjb4p7UuzBG7SXIaA/hNIkaMP6K+gXYGxP38ZcrofzqN0HeZ7A90oqsOa97WU7WZkSw==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/types" "^29.0.1"
+    "@jest/types" "^29.1.2"
     "@jridgewell/trace-mapping" "^0.3.15"
     babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.0.1"
+    jest-haste-map "^29.1.2"
     jest-regex-util "^29.0.0"
-    jest-util "^29.0.1"
+    jest-util "^29.1.2"
     micromatch "^4.0.4"
     pirates "^4.0.4"
     slash "^3.0.0"
@@ -1467,10 +1489,10 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jest/types@^29.0.1":
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.0.1.tgz#1985650acf137bdb81710ff39a4689ec071dd86a"
-  integrity sha512-ft01rxzVsbh9qZPJ6EFgAIj3PT9FCRfBF9Xljo2/33VDOUjLZr0ZJ2oKANqh9S/K0/GERCsHDAQlBwj7RxA+9g==
+"@jest/types@^29.1.2":
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.1.2.tgz#7442d32b16bcd7592d9614173078b8c334ec730a"
+  integrity sha512-DcXGtoTykQB5jiwCmVr8H4vdg2OJhQex3qPkG+ISyDO7xQXbt/4R6dowcRyPemRnkH7JoHvZuxPBdlq+9JxFCg==
   dependencies:
     "@jest/schemas" "^29.0.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
@@ -1596,6 +1618,11 @@
     redux-thunk "^2.4.1"
     reselect "^4.1.5"
 
+"@remix-run/router@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.0.1.tgz#88d7ac31811ab0cef14aaaeae2a0474923b278bc"
+  integrity sha512-eBV5rvW4dRFOU1eajN7FmYxjAIVz/mRHgUE9En9mBn6m3mulK3WTR5C3iQhL9MZ14rWAq+xOlEaCkDiW0/heOg==
+
 "@sinclair/typebox@^0.24.1":
   version "0.24.20"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.20.tgz#11a657875de6008622d53f56e063a6347c51a6dd"
@@ -1660,10 +1687,10 @@
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.3.1.tgz#21a285dbffdce9567c437ebf0d081bf9210807e6"
   integrity sha512-cZ8Tr6ZAWNUFfDeCKn/pGi976iWSkS8ijmEYKosP+6ktdZ7lW9HVLHojyusPw3w0j8PI4VBeWAXAmi/2G7owxw==
 
-"@svgr/babel-preset@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.3.1.tgz#8bd1ead79637d395e9362b01dd37cfd59702e152"
-  integrity sha512-tQtWtzuMMQ3opH7je+MpwfuRA1Hf3cKdSgTtAYwOBDfmhabP7rcTfBi3E7V3MuwJNy/Y02/7/RutvwS1W4Qv9g==
+"@svgr/babel-preset@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.4.0.tgz#b85bd1c64d03fcb3f930169541de4cf9ff4eaed9"
+  integrity sha512-Ytuh7N282fv2Cy1JePf6HZ29/G5Hb8mQAjx4iykPjvfFl9NK6o5lZavmewgjOGT8kNPtwgvheuOQn4CifHRUhQ==
   dependencies:
     "@svgr/babel-plugin-add-jsx-attribute" "^6.3.1"
     "@svgr/babel-plugin-remove-jsx-attribute" "^6.3.1"
@@ -1674,31 +1701,32 @@
     "@svgr/babel-plugin-transform-react-native-svg" "^6.3.1"
     "@svgr/babel-plugin-transform-svg-component" "^6.3.1"
 
-"@svgr/core@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.3.1.tgz#752adf49d8d5473b15d76ca741961de093f715bd"
-  integrity sha512-Sm3/7OdXbQreemf9aO25keerZSbnKMpGEfmH90EyYpj1e8wMD4TuwJIb3THDSgRMWk1kYJfSRulELBy4gVgZUA==
+"@svgr/core@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.4.0.tgz#95878c7b23962febc14735885bdb9f35ee2735e5"
+  integrity sha512-wU9uyF6BUnwAqG7fDOowmDQzmbvovj1uq/iETfMK9xwQNaT+e7yN7SmDDcETXC72dnOrMcRuEWw0JEvpJha+yg==
   dependencies:
-    "@svgr/plugin-jsx" "^6.3.1"
+    "@svgr/babel-preset" "^6.4.0"
+    "@svgr/plugin-jsx" "^6.4.0"
     camelcase "^6.2.0"
     cosmiconfig "^7.0.1"
 
-"@svgr/hast-util-to-babel-ast@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.3.1.tgz#59614e24d2a4a28010e02089213b3448d905769d"
-  integrity sha512-NgyCbiTQIwe3wHe/VWOUjyxmpUmsrBjdoIxKpXt3Nqc3TN30BpJG22OxBvVzsAh9jqep0w0/h8Ywvdk3D9niNQ==
+"@svgr/hast-util-to-babel-ast@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.4.0.tgz#864032f02fdc7fc9c7cd62480417cc54341cb9bd"
+  integrity sha512-PjcU8jCneKXJnrREycsgfgQ/bzR1ogSKC5MBeUu2wmEoJIjzXX7X14DDktUjU9bkBy26yMDiVHn46Nl82P3WEg==
   dependencies:
     "@babel/types" "^7.18.4"
     entities "^4.3.0"
 
-"@svgr/plugin-jsx@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.3.1.tgz#de7b2de824296b836d6b874d498377896e367f50"
-  integrity sha512-r9+0mYG3hD4nNtUgsTXWGYJomv/bNd7kC16zvsM70I/bGeoCi/3lhTmYqeN6ChWX317OtQCSZZbH4wq9WwoXbw==
+"@svgr/plugin-jsx@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.4.0.tgz#f756b7d71fd535801e042cd5d5038eebd318582d"
+  integrity sha512-gu6E7v8qRAtCxbymI1et3G7athogvKvzsJkSWiHVZsuVZbyx5O2b7+DIkKvAGh2RvEzgSvfGf8QD1BaHal2vBw==
   dependencies:
     "@babel/core" "^7.18.5"
-    "@svgr/babel-preset" "^6.3.1"
-    "@svgr/hast-util-to-babel-ast" "^6.3.1"
+    "@svgr/babel-preset" "^6.4.0"
+    "@svgr/hast-util-to-babel-ast" "^6.4.0"
     svg-parser "^2.0.4"
 
 "@svgr/plugin-svgo@^6.3.1":
@@ -1710,24 +1738,24 @@
     deepmerge "^4.2.2"
     svgo "^2.8.0"
 
-"@svgr/webpack@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.3.1.tgz#001d03236ebb03bf47c0a4b92d5423e05095ebe6"
-  integrity sha512-eODxwIUShLxSMaRjzJtrj9wg89D75JLczvWg9SaB5W+OtVTkiC1vdGd8+t+pf5fTlBOy4RRXAq7x1E3DUl3D0A==
+"@svgr/webpack@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.4.0.tgz#6db74282ecd753c4a279c9c595a511e43aa89570"
+  integrity sha512-ejt2JdVX6k0XzUjVObMcTzTgsaCadEVCHBvOt3J0Vcp3eFirf0nqsjQCUD+ogFep25+ICDMZa1nLlotbXxKDXw==
   dependencies:
     "@babel/core" "^7.18.5"
     "@babel/plugin-transform-react-constant-elements" "^7.17.12"
     "@babel/preset-env" "^7.18.2"
     "@babel/preset-react" "^7.17.12"
     "@babel/preset-typescript" "^7.17.12"
-    "@svgr/core" "^6.3.1"
-    "@svgr/plugin-jsx" "^6.3.1"
+    "@svgr/core" "^6.4.0"
+    "@svgr/plugin-jsx" "^6.4.0"
     "@svgr/plugin-svgo" "^6.3.1"
 
-"@testing-library/dom@^8.17.1", "@testing-library/dom@^8.5.0":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.17.1.tgz#2d7af4ff6dad8d837630fecd08835aee08320ad7"
-  integrity sha512-KnH2MnJUzmFNPW6RIKfd+zf2Wue8mEKX0M3cpX6aKl5ZXrJM1/c/Pc8c2xDNYQCnJO48Sm5ITbMXgqTr3h4jxQ==
+"@testing-library/dom@^8.18.1", "@testing-library/dom@^8.5.0":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.18.1.tgz#80f91be02bc171fe5a3a7003f88207be31ac2cf3"
+  integrity sha512-oEvsm2B/WtcHKE+IcEeeCqNU/ltFGaVyGbpcm4g/2ytuT49jrlH9x5qRKL/H3A6yfM4YAbSbC0ceT5+9CEXnLg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
@@ -1753,10 +1781,10 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
-"@testing-library/react@13.3.0":
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.3.0.tgz#bf298bfbc5589326bbcc8052b211f3bb097a97c5"
-  integrity sha512-DB79aA426+deFgGSjnf5grczDPiL4taK3hFaa+M5q7q20Kcve9eQottOG5kZ74KEr55v0tU2CQormSSDK87zYQ==
+"@testing-library/react@13.4.0":
+  version "13.4.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.4.0.tgz#6a31e3bf5951615593ad984e96b9e5e2d9380966"
+  integrity sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@testing-library/dom" "^8.5.0"
@@ -1872,10 +1900,10 @@
   dependencies:
     "@types/ms" "*"
 
-"@types/dom-mediacapture-record@^1.0.11":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.11.tgz#f61b17e6131d76629d4039b02634c7e786b82c3a"
-  integrity sha512-ODVOH95x08arZhbQOjH3no7Iye64akdO+55nM+IGtTzpu2ACKr9CQTrI//CCVieIjlI/eL+rK1hQjMycxIgylQ==
+"@types/dom-mediacapture-record@^1.0.13":
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.13.tgz#d13d81f1bd2c473dbc566b98ed774d6741548078"
+  integrity sha512-awMC2n4iRwJ6VWpQDA7dPqJhImeXHsVeEoQKWkdGB2cau+h/6erGoVre5Dk8p/DL1LIiLUcK6MnC3mibiKRRFg==
 
 "@types/eslint-scope@^3.7.3":
   version "3.7.3"
@@ -2031,10 +2059,10 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/node@*", "@types/node@18.7.13":
-  version "18.7.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.13.tgz#23e6c5168333480d454243378b69e861ab5c011a"
-  integrity sha512-46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw==
+"@types/node@*", "@types/node@18.8.2":
+  version "18.8.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.8.2.tgz#17d42c6322d917764dd3d2d3a10d7884925de067"
+  integrity sha512-cRMwIgdDN43GO4xMWAfJAecYn8wV4JbsOGHNfNUIDiuYkUYAR5ec4Rj7IO2SAhFPEfpPtLtUTbbny/TCT7aDwA==
 
 "@types/node@^14.14.31":
   version "14.18.18"
@@ -2115,10 +2143,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@18.0.17":
-  version "18.0.17"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4"
-  integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==
+"@types/react@*", "@types/react@18.0.21":
+  version "18.0.21"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.21.tgz#b8209e9626bb00a34c76f55482697edd2b43cc67"
+  integrity sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -2719,15 +2747,15 @@ babel-jest@^28.1.3:
     graceful-fs "^4.2.9"
     slash "^3.0.0"
 
-babel-jest@^29.0.1:
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.0.1.tgz#db50de501fc8727e768f5aa417496cb871ee1ba0"
-  integrity sha512-wyI9r8tqwsZEMWiIaYjdUJ6ztZIO4DMWpGq7laW34wR71WtRS+D/iBEtXOP5W2aSYCVUQMsypRl/xiJYZznnTg==
+babel-jest@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.1.2.tgz#540d3241925c55240fb0c742e3ffc5f33a501978"
+  integrity sha512-IuG+F3HTHryJb7gacC7SQ59A9kO56BctUsT67uJHp1mMCHUOMXpDwOHWGifWqdWVknN2WNkCVQELPjXx0aLJ9Q==
   dependencies:
-    "@jest/transform" "^29.0.1"
+    "@jest/transform" "^29.1.2"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.0.0"
+    babel-preset-jest "^29.0.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     slash "^3.0.0"
@@ -2770,39 +2798,39 @@ babel-plugin-jest-hoist@^28.1.3:
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-jest-hoist@^29.0.0:
-  version "29.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.0.0.tgz#ae4873399a199ede93697a15919d3d0f614a2eb1"
-  integrity sha512-B9oaXrlxXHFWeWqhDPg03iqQd2UN/mg/VdZOsLaqAVBkztru3ctTryAI4zisxLEEgmcUnLTKewqx0gGifoXD3A==
+babel-plugin-jest-hoist@^29.0.2:
+  version "29.0.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.0.2.tgz#ae61483a829a021b146c016c6ad39b8bcc37c2c8"
+  integrity sha512-eBr2ynAEFjcebVvu8Ktx580BD1QKCrBG1XwEUTXJe285p9HA/4hOhfWCFRQhTKSyBV0VzjhG7H91Eifz9s29hg==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-polyfill-corejs2@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d"
-  integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
     "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
-  integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
-    core-js-compat "^3.21.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe"
-  integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
@@ -2830,12 +2858,12 @@ babel-preset-jest@^28.1.3:
     babel-plugin-jest-hoist "^28.1.3"
     babel-preset-current-node-syntax "^1.0.0"
 
-babel-preset-jest@^29.0.0:
-  version "29.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.0.0.tgz#52d7f1afe3a15d14a3c5ab4349cbd388d98d330b"
-  integrity sha512-B5Ke47Xcs8rDF3p1korT3LoilpADCwbG93ALqtvqu6Xpf4d8alKkrCBTExbNzdHJcIuEPpfYvEaFFRGee2kUgQ==
+babel-preset-jest@^29.0.2:
+  version "29.0.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.0.2.tgz#e14a7124e22b161551818d89e5bdcfb3b2b0eac7"
+  integrity sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==
   dependencies:
-    babel-plugin-jest-hoist "^29.0.0"
+    babel-plugin-jest-hoist "^29.0.2"
     babel-preset-current-node-syntax "^1.0.0"
 
 bail@^2.0.0:
@@ -2938,7 +2966,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4.20.3:
+browserslist@^4.14.5:
   version "4.20.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
   integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==
@@ -2949,6 +2977,16 @@ browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4.20.3:
     node-releases "^2.0.3"
     picocolors "^1.0.0"
 
+browserslist@^4.21.3, browserslist@^4.21.4:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+  dependencies:
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
+
 bs-logger@0.x:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
@@ -3017,31 +3055,41 @@ camel-case@^4.1.2:
     pascal-case "^3.1.2"
     tslib "^2.0.3"
 
-camelcase-keys@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252"
-  integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==
+camelcase-keys@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-8.0.2.tgz#a7140ba7c797aea32161d4ce5cdbda11d09eb414"
+  integrity sha512-qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA==
   dependencies:
-    camelcase "^6.3.0"
-    map-obj "^4.1.0"
-    quick-lru "^5.1.1"
-    type-fest "^1.2.1"
+    camelcase "^7.0.0"
+    map-obj "^4.3.0"
+    quick-lru "^6.1.1"
+    type-fest "^2.13.0"
 
 camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0, camelcase@^6.3.0:
+camelcase@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
+camelcase@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.0.tgz#fd112621b212126741f998d614cbc2a8623fd174"
+  integrity sha512-JToIvOmz6nhGsUhAYScbo2d6Py5wojjNfoxoc2mEVLUdJ70gJK2gnd+ABY1Tc3sVMyK7QDPtN0T/XdlCQWITyQ==
+
 caniuse-lite@^1.0.30001332:
   version "1.0.30001342"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz#87152b1e3b950d1fbf0093e23f00b6c8e8f1da96"
   integrity sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==
 
+caniuse-lite@^1.0.30001400:
+  version "1.0.30001406"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001406.tgz#d0146e7919635479f873b4507517b627f66ab269"
+  integrity sha512-bWTlaXUy/rq0BBtYShc/jArYfBPjEV95euvZ8JVtO43oQExEN/WquoqpufFjNu4kSpi5cy5kMbNvzztWDfv1Jg==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -3333,23 +3381,22 @@ copy-webpack-plugin@^11.0.0:
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.22.7"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.7.tgz#8359eb66ecbf726dd0cfced8e48d5e73f3224239"
-  integrity sha512-uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA==
+core-js-compat@^3.25.1:
+  version "3.25.2"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.2.tgz#7875573586809909c69e03ef310810c1969ee138"
+  integrity sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==
   dependencies:
-    browserslist "^4.20.3"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
 core-js-pure@^3.8.1:
   version "3.22.7"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.7.tgz#f58489d9b309fa7b26486a0f70d4ec19a418084e"
   integrity sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w==
 
-core-js@3.25.0:
-  version "3.25.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb"
-  integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==
+core-js@3.25.5:
+  version "3.25.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.5.tgz#e86f651a2ca8a0237a5f064c2fe56cef89646e27"
+  integrity sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -3463,10 +3510,10 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
   integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
 
-cypress@10.6.0:
-  version "10.6.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.6.0.tgz#13f46867febf2c3715874ed5dce9c2e946b175fe"
-  integrity sha512-6sOpHjostp8gcLO34p6r/Ci342lBs8S5z9/eb3ZCQ22w2cIhMWGUoGKkosabPBfKcvRS9BE4UxybBtlIs8gTQA==
+cypress@10.9.0:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.9.0.tgz#273a61a6304766f9d6423e5ac8d4a9a11ed8b485"
+  integrity sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -3487,7 +3534,7 @@ cypress@10.6.0:
     dayjs "^1.10.4"
     debug "^4.3.2"
     enquirer "^2.3.6"
-    eventemitter2 "^6.4.3"
+    eventemitter2 "6.4.7"
     execa "4.1.0"
     executable "^4.1.1"
     extract-zip "2.0.1"
@@ -3787,15 +3834,20 @@ electron-to-chromium@^1.4.118:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.138.tgz#3ec41ca589aaf505dfe2034fde913329af801730"
   integrity sha512-IOyp2Seq3w4QLln+yZWcMF3VXhhduz4bwg9gfI+CnP5TkzwNXQ8FCZuwwPsnes73AfWdf5J2n2OXdUwDUspDPQ==
 
+electron-to-chromium@^1.4.251:
+  version "1.4.254"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz#c6203583890abf88dfc0be046cd72d3b48f8beb6"
+  integrity sha512-Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q==
+
 emittery@^0.10.2:
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
   integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
-emoji-mart@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.2.1.tgz#eccd7d650e7bc042a07834a263b87c8153f214e5"
-  integrity sha512-q6lz1u8TrGrO5Bv8dL2Z5atTRQaci3YzUfbYN0MzlLmIKdRt3N6vNT7uvCWRKc1tERrI45sn0nQYk3g99cBr/w==
+emoji-mart@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.2.2.tgz#1c093ffc19554dd6edfcfeec9aca43ff38bcc16e"
+  integrity sha512-BvcrX+Ps9MxSVEjnvxupclU3MBD6WVC4WZOY26csfC6oFdaWpFhdrzeVNVBmCLPOmzY1SE0aAsqZJRNVbZ1yhQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -3975,10 +4027,10 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-plugin-react@^7.31.1:
-  version "7.31.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.1.tgz#d29793ed27743f3ed8a473c347b1bf5a0a8fb9af"
-  integrity sha512-j4/2xWqt/R7AZzG8CakGHA6Xa/u7iR8Q3xCxY+AUghdT92bnIDOBEefV456OeH0QvBcroVc0eyvrrLSyQGYIfg==
+eslint-plugin-react@^7.31.8:
+  version "7.31.8"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz#3a4f80c10be1bcbc8197be9e8b641b2a3ef219bf"
+  integrity sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==
   dependencies:
     array-includes "^3.1.5"
     array.prototype.flatmap "^1.3.0"
@@ -4121,10 +4173,10 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-eventemitter2@^6.4.3:
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655"
-  integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==
+eventemitter2@6.4.7:
+  version "6.4.7"
+  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
+  integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
@@ -4701,13 +4753,6 @@ he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-history@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
-  integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
-  dependencies:
-    "@babel/runtime" "^7.7.6"
-
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -4870,10 +4915,10 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-i18next@^21.9.1:
-  version "21.9.1"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.1.tgz#9e3428990f5b2cc9ac1b98dd025f3e411c368249"
-  integrity sha512-ITbDrAjbRR73spZAiu6+ex5WNlHRr1mY+acDi2ioTHuUiviJqSz269Le1xHAf0QaQ6GgIHResUhQNcxGwa/PhA==
+i18next@^21.9.2:
+  version "21.9.2"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.2.tgz#3f7c5594393eb27117c1db4c38f5ec766e68de0e"
+  integrity sha512-00fVrLQOwy45nm3OtC9l1WiLK3nJlIYSljgCt0qzTaAy65aciMdRy9GsuW+a2AtKtdg9/njUGfRH30LRupV7ZQ==
   dependencies:
     "@babel/runtime" "^7.17.2"
 
@@ -5378,18 +5423,18 @@ jest-each@^28.1.3:
     jest-util "^28.1.3"
     pretty-format "^28.1.3"
 
-jest-environment-jsdom@^29.0.1:
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.0.1.tgz#45bb0ef6506cafcff0809c961e841d2d4c9820cf"
-  integrity sha512-rMF501kfui+bw4AmwowLA2bNaYb633A3ejFMN5pVU0AeOqLv2NbMAY5XzzlMr/+lM1itEf+3ZdCr9dGGrUfoxg==
+jest-environment-jsdom@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.1.2.tgz#59c5d7c53c999e1518cc2f1cd4ee19ab4b68eb68"
+  integrity sha512-D+XNIKia5+uDjSMwL/G1l6N9MCb7LymKI8FpcLo7kkISjc/Sa9w+dXXEa7u1Wijo3f8sVLqfxdGqYtRhmca+Xw==
   dependencies:
-    "@jest/environment" "^29.0.1"
-    "@jest/fake-timers" "^29.0.1"
-    "@jest/types" "^29.0.1"
+    "@jest/environment" "^29.1.2"
+    "@jest/fake-timers" "^29.1.2"
+    "@jest/types" "^29.1.2"
     "@types/jsdom" "^20.0.0"
     "@types/node" "*"
-    jest-mock "^29.0.1"
-    jest-util "^29.0.1"
+    jest-mock "^29.1.2"
+    jest-util "^29.1.2"
     jsdom "^20.0.0"
 
 jest-environment-node@^28.1.3:
@@ -5428,20 +5473,20 @@ jest-haste-map@^28.1.3:
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-haste-map@^29.0.1:
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.0.1.tgz#472212f93ef44309bf97d191f93ddd2e41169615"
-  integrity sha512-gcKOAydafpGoSBvcj/mGCfhOKO8fRLkAeee1KXGdcJ1Pb9O2nnOl4I8bQSIID2MaZeMHtLLgNboukh/pUGkBtg==
+jest-haste-map@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.1.2.tgz#93f3634aa921b6b654e7c94137b24e02e7ca6ac9"
+  integrity sha512-xSjbY8/BF11Jh3hGSPfYTa/qBFrm3TPM7WU8pU93m2gqzORVLkHFWvuZmFsTEBPRKndfewXhMOuzJNHyJIZGsw==
   dependencies:
-    "@jest/types" "^29.0.1"
+    "@jest/types" "^29.1.2"
     "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.9"
     jest-regex-util "^29.0.0"
-    jest-util "^29.0.1"
-    jest-worker "^29.0.1"
+    jest-util "^29.1.2"
+    jest-worker "^29.1.2"
     micromatch "^4.0.4"
     walker "^1.0.8"
   optionalDependencies:
@@ -5480,18 +5525,18 @@ jest-message-util@^28.1.3:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-message-util@^29.0.1:
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.0.1.tgz#85c4b5b90296c228da158e168eaa5b079f2ab879"
-  integrity sha512-wRMAQt3HrLpxSubdnzOo68QoTfQ+NLXFzU0Heb18ZUzO2S9GgaXNEdQ4rpd0fI9dq2NXkpCk1IUWSqzYKji64A==
+jest-message-util@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.1.2.tgz#c21a33c25f9dc1ebfcd0f921d89438847a09a501"
+  integrity sha512-9oJ2Os+Qh6IlxLpmvshVbGUiSkZVc2FK+uGOm6tghafnB2RyjKAxMZhtxThRMxfX1J1SOMhTn9oK3/MutRWQJQ==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.0.1"
+    "@jest/types" "^29.1.2"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^29.0.1"
+    pretty-format "^29.1.2"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
@@ -5503,13 +5548,14 @@ jest-mock@^28.1.3:
     "@jest/types" "^28.1.3"
     "@types/node" "*"
 
-jest-mock@^29.0.1:
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.0.1.tgz#12e1b137035365b022ccdb8fd67d476cd4d4bfad"
-  integrity sha512-i1yTceg2GKJwUNZFjIzrH7Y74fN1SKJWxQX/Vu3LT4TiJerFARH5l+4URNyapZ+DNpchHYrGOP2deVbn3ma8JA==
+jest-mock@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.1.2.tgz#de47807edbb9d4abf8423f1d8d308d670105678c"
+  integrity sha512-PFDAdjjWbjPUtQPkQufvniXIS3N9Tv7tbibePEjIIprzjgo0qQlyUiVMrT4vL8FaSJo1QXifQUOuPH3HQC/aMA==
   dependencies:
-    "@jest/types" "^29.0.1"
+    "@jest/types" "^29.1.2"
     "@types/node" "*"
+    jest-util "^29.1.2"
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
@@ -5645,12 +5691,12 @@ jest-util@^28.0.0, jest-util@^28.1.3:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-util@^29.0.1:
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.0.1.tgz#f854a4a8877c7817316c4afbc2a851ceb2e71598"
-  integrity sha512-GIWkgNfkeA9d84rORDHPGGTFBrRD13A38QVSKE0bVrGSnoR1KDn8Kqz+0yI5kezMgbT/7zrWaruWP1Kbghlb2A==
+jest-util@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.1.2.tgz#ac5798e93cb6a6703084e194cfa0898d66126df1"
+  integrity sha512-vPCk9F353i0Ymx3WQq3+a4lZ07NXu9Ca8wya6o4Fe4/aO1e1awMMprZ3woPFpKwghEOW+UXgd15vVotuNN9ONQ==
   dependencies:
-    "@jest/types" "^29.0.1"
+    "@jest/types" "^29.1.2"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
@@ -5701,12 +5747,13 @@ jest-worker@^28.1.3:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@^29.0.1:
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.0.1.tgz#fb42ff7e05e0573f330ec0cf781fc545dcd11a31"
-  integrity sha512-+B/2/8WW7goit7qVezG9vnI1QP3dlmuzi2W0zxazAQQ8dcDIA63dDn6j4pjOGBARha/ZevcwYQtNIzCySbS7fQ==
+jest-worker@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.1.2.tgz#a68302af61bce82b42a9a57285ca7499d29b2afc"
+  integrity sha512-AdTZJxKjTSPHbXT/AIOjQVmoFx0LHFcVabWu0sxI7PAy7rFf8c0upyvgBKgguVXdM4vY74JdwkyD4hSmpTW8jA==
   dependencies:
     "@types/node" "*"
+    jest-util "^29.1.2"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
@@ -6067,7 +6114,7 @@ makeerror@1.0.12:
   dependencies:
     tmpl "1.0.5"
 
-map-obj@^4.1.0:
+map-obj@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
@@ -6504,6 +6551,11 @@ node-releases@^2.0.3:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
   integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
 
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -6877,10 +6929,10 @@ postcss@^8.4.7:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-preact@^10.10.6:
-  version "10.10.6"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.10.6.tgz#1fe62aecf93974b64e6a42e09ba1f00f93207d14"
-  integrity sha512-w0mCL5vICUAZrh1DuHEdOWBjxdO62lvcO++jbzr8UhhYcTbFkpegLH9XX+7MadjTl/y0feoqwQ/zAnzkc/EGog==
+preact@^10.11.0:
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.11.0.tgz#26af45a0613f4e17a197cc39d7a1ea23e09b2532"
+  integrity sha512-Fk6+vB2kb6mSJfDgODq0YDhMfl0HNtK5+Uc9QqECO4nlyPAQwCI+BKyWO//idA7ikV7o+0Fm6LQmNuQi1wXI1w==
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -6929,10 +6981,10 @@ pretty-format@^28.0.0, pretty-format@^28.1.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-pretty-format@^29.0.1:
-  version "29.0.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.0.1.tgz#2f8077114cdac92a59b464292972a106410c7ad0"
-  integrity sha512-iTHy3QZMzuL484mSTYbQIM1AHhEQsH8mXWS2/vd2yFBYnG3EBqGiMONo28PlPgrW7P/8s/1ISv+y7WH306l8cw==
+pretty-format@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.1.2.tgz#b1f6b75be7d699be1a051f5da36e8ae9e76a8e6a"
+  integrity sha512-CGJ6VVGXVRP2o2Dorl4mAwwvDWT25luIsYhkyVQW32E4nL+TgW939J7LlKT/npq5Cpq6j3s+sy+13yk7xYpBmg==
   dependencies:
     "@jest/schemas" "^29.0.0"
     ansi-styles "^5.0.0"
@@ -7023,10 +7075,10 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-quick-lru@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
-  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+quick-lru@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-6.1.1.tgz#f8e5bf9010376c126c80c1a62827a526c0e60adf"
+  integrity sha512-S27GBT+F0NTRiehtbrgaSE1idUAJ5bX8dPAQTdylEyNlrdcH5X4Lz7Edz3DYzecbsCluD5zO8ZNEe04z3D3u6Q==
 
 randombytes@^2.1.0:
   version "2.1.0"
@@ -7094,10 +7146,10 @@ react-hot-loader@^4.13.0:
     shallowequal "^1.1.0"
     source-map "^0.7.3"
 
-react-i18next@^11.18.5:
-  version "11.18.5"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.5.tgz#985e87bc66ed1316381b464a4ecfd35a2c951357"
-  integrity sha512-cKcyuuzIv0YUZ4l9WORflVNuhISPAqQShOAsxwFyYuJoCA7HlLmHm7XnvO6hfAGmGpDNRhJHoBX8hG49Cb2xZQ==
+react-i18next@^11.18.6:
+  version "11.18.6"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887"
+  integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==
   dependencies:
     "@babel/runtime" "^7.14.5"
     html-parse-stringify "^3.0.1"
@@ -7170,20 +7222,20 @@ react-refresh@^0.14.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
   integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
 
-react-router-dom@6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d"
-  integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==
+react-router-dom@6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.1.tgz#99c9b7c4967890701c888517475aa5d54d25760e"
+  integrity sha512-MY7NJCrGNVJtGp8ODMOBHu20UaIkmwD2V3YsAOUQoCXFk7Ppdwf55RdcGyrSj+ycSL9Uiwrb3gTLYSnzcRoXww==
   dependencies:
-    history "^5.2.0"
-    react-router "6.3.0"
+    "@remix-run/router" "1.0.1"
+    react-router "6.4.1"
 
-react-router@6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
-  integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
+react-router@6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.1.tgz#dd9cc4dfa264751d143a4b6c9d4faa60ab3ce26c"
+  integrity sha512-OJASKp5AykDWFewgWUim1vlLr7yfD4vO/h+bSgcP/ix8Md+LMHuAjovA74MQfsfhQJGGN1nHRhwS5qQQbbBt3A==
   dependencies:
-    history "^5.2.0"
+    "@remix-run/router" "1.0.1"
 
 react-shallow-renderer@^16.15.0:
   version "16.15.0"
@@ -7509,10 +7561,10 @@ sass-loader@^13.0.2:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@^1.54.5:
-  version "1.54.5"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.5.tgz#93708f5560784f6ff2eab8542ade021a4a947b3a"
-  integrity sha512-p7DTOzxkUPa/63FU0R3KApkRHwcVZYC0PLnLm5iyZACyp15qSi32x7zVUhRdABAATmkALqgGrjCJAcWvobmhHw==
+sass@^1.55.0:
+  version "1.55.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c"
+  integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -7573,10 +7625,10 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56"
-  integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==
+selfsigned@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
+  integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
   dependencies:
     node-forge "^1"
 
@@ -7585,11 +7637,6 @@ semver@5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.5:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
@@ -8049,10 +8096,10 @@ terminal-link@^2.0.0:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
-terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.5:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz#f7d82286031f915a4f8fb81af4bd35d2e3c011bc"
-  integrity sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==
+terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.6:
+  version "5.3.6"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
+  integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.14"
     jest-worker "^27.4.5"
@@ -8263,10 +8310,10 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-type-fest@^1.2.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
-  integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
+type-fest@^2.13.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
+  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
 
 type-is@~1.6.18:
   version "1.6.18"
@@ -8281,10 +8328,10 @@ typesafe-actions@^5.1.0:
   resolved "https://registry.yarnpkg.com/typesafe-actions/-/typesafe-actions-5.1.0.tgz#9afe8b1e6a323af1fd59e6a57b11b7dd6623d2f1"
   integrity sha512-bna6Yi1pRznoo6Bz1cE6btB/Yy8Xywytyfrzu/wc+NFW3ZF0I+2iCGImhBsoYYCOWuICtRO4yHcnDlzgo1AdNg==
 
-typescript@^4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
-  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
+typescript@^4.8.4:
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
+  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
 unbox-primitive@^1.0.1, unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -8417,6 +8464,14 @@ untildify@^4.0.0:
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
   integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
+update-browserslist-db@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18"
+  integrity sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -8621,10 +8676,10 @@ webpack-dev-middleware@^5.3.1:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@^4.10.1:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz#124ac9ac261e75303d74d95ab6712b4aec3e12ed"
-  integrity sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw==
+webpack-dev-server@^4.11.1:
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz#ae07f0d71ca0438cf88446f09029b92ce81380b5"
+  integrity sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -8649,7 +8704,7 @@ webpack-dev-server@^4.10.1:
     p-retry "^4.5.0"
     rimraf "^3.0.2"
     schema-utils "^4.0.0"
-    selfsigned "^2.0.1"
+    selfsigned "^2.1.1"
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
@@ -8810,12 +8865,7 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
-ws@^8.4.2:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23"
-  integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==
-
-ws@^8.8.0:
+ws@^8.4.2, ws@^8.8.0:
   version "8.8.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
   integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==