diff --git a/.env.example b/.env.example
index b7ba0920d..2ab2933dc 100644
--- a/.env.example
+++ b/.env.example
@@ -2,7 +2,7 @@
 # https://www.chatwoot.com/docs/self-hosted/configuration/environment-variables/#rails-production-variables
 
 # Used to verify the integrity of signed cookies. so ensure a secure value is set
-# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols. 
+# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols.
 # Use `rake secret` to generate this variable
 SECRET_KEY_BASE=replace_with_lengthy_secure_hex
 
@@ -216,6 +216,8 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # ENABLE_RACK_ATTACK=true
 # RACK_ATTACK_LIMIT=300
 # ENABLE_RACK_ATTACK_WIDGET_API=true
+# Comma-separated list of trusted IPs that bypass Rack Attack throttling rules
+# RACK_ATTACK_ALLOWED_IPS=127.0.0.1,::1,192.168.0.10
 
 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
@@ -257,4 +259,3 @@ AZURE_APP_SECRET=
 # Set to true if you want to remove stale contact inboxes
 # contact_inboxes with no conversation older than 90 days will be removed
 # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
-
diff --git a/Gemfile.lock b/Gemfile.lock
index d3ef47631..da19dbb72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -567,7 +567,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (2.2.14)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.5.0)
diff --git a/app/controllers/api/v1/accounts/articles_controller.rb b/app/controllers/api/v1/accounts/articles_controller.rb
index 9148e4386..da2be2312 100644
--- a/app/controllers/api/v1/accounts/articles_controller.rb
+++ b/app/controllers/api/v1/accounts/articles_controller.rb
@@ -68,7 +68,7 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
 
   def article_params
     params.require(:article).permit(
-      :title, :slug, :position, :content, :description, :position, :category_id, :author_id, :associated_article_id, :status,
+      :title, :slug, :position, :content, :description, :category_id, :author_id, :associated_article_id, :status,
       :locale, meta: [:title,
                       :description,
                       { tags: [] }]
diff --git a/app/controllers/api/v1/accounts/custom_filters_controller.rb b/app/controllers/api/v1/accounts/custom_filters_controller.rb
index f458c018f..b4345bb8a 100644
--- a/app/controllers/api/v1/accounts/custom_filters_controller.rb
+++ b/app/controllers/api/v1/accounts/custom_filters_controller.rb
@@ -1,6 +1,6 @@
 class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController
   before_action :check_authorization
-  before_action :fetch_custom_filters, except: [:create]
+  before_action :fetch_custom_filters, only: [:index]
   before_action :fetch_custom_filter, only: [:show, :update, :destroy]
   DEFAULT_FILTER_TYPE = 'conversation'.freeze
 
@@ -9,8 +9,8 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
   def show; end
 
   def create
-    @custom_filter = current_user.custom_filters.create!(
-      permitted_payload.merge(account_id: Current.account.id)
+    @custom_filter = Current.account.custom_filters.create!(
+      permitted_payload.merge(user: Current.user)
     )
     render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid?
   end
@@ -27,14 +27,16 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
   private
 
   def fetch_custom_filters
-    @custom_filters = current_user.custom_filters.where(
-      account_id: Current.account.id,
+    @custom_filters = Current.account.custom_filters.where(
+      user: Current.user,
       filter_type: permitted_params[:filter_type] || DEFAULT_FILTER_TYPE
     )
   end
 
   def fetch_custom_filter
-    @custom_filter = @custom_filters.find(permitted_params[:id])
+    @custom_filter = Current.account.custom_filters.where(
+      user: Current.user
+    ).find(permitted_params[:id])
   end
 
   def permitted_payload
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index b247b9715..c610dc846 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -92,7 +92,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def settings_params
-    params.permit(:auto_resolve_after, :auto_resolve_message)
+    params.permit(:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting)
   end
 
   def check_signup_enabled
diff --git a/app/controllers/concerns/access_token_auth_helper.rb b/app/controllers/concerns/access_token_auth_helper.rb
index 2ee9f9854..9b0f9021f 100644
--- a/app/controllers/concerns/access_token_auth_helper.rb
+++ b/app/controllers/concerns/access_token_auth_helper.rb
@@ -1,6 +1,6 @@
 module AccessTokenAuthHelper
   BOT_ACCESSIBLE_ENDPOINTS = {
-    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update],
+    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update custom_attributes],
     'api/v1/accounts/conversations/messages' => ['create'],
     'api/v1/accounts/conversations/assignments' => ['create']
   }.freeze
diff --git a/app/javascript/dashboard/components-next/TeleportWithDirection.vue b/app/javascript/dashboard/components-next/TeleportWithDirection.vue
new file mode 100644
index 000000000..3e9009f08
--- /dev/null
+++ b/app/javascript/dashboard/components-next/TeleportWithDirection.vue
@@ -0,0 +1,28 @@
+<!--
+ * Preserves RTL/LTR context when teleporting content
+ * Ensures direction-specific classes (ltr:tailwind-class, rtl:tailwind-class) work correctly
+ * when content is teleported outside the app's container with [dir] attribute
+-->
+<script setup>
+import { computed } from 'vue';
+import { useMapGetter } from 'dashboard/composables/store';
+
+defineProps({
+  to: {
+    type: String,
+    default: 'body',
+  },
+});
+
+const isRTL = useMapGetter('accounts/isRTL');
+
+const contentDirection = computed(() => (isRTL.value ? 'rtl' : 'ltr'));
+</script>
+
+<template>
+  <Teleport :to="to">
+    <div :dir="contentDirection">
+      <slot />
+    </div>
+  </Teleport>
+</template>
diff --git a/app/javascript/dashboard/components-next/dialog/Dialog.vue b/app/javascript/dashboard/components-next/dialog/Dialog.vue
index 6800b1254..78ca5206b 100644
--- a/app/javascript/dashboard/components-next/dialog/Dialog.vue
+++ b/app/javascript/dashboard/components-next/dialog/Dialog.vue
@@ -2,9 +2,9 @@
 import { ref, computed } from 'vue';
 import { OnClickOutside } from '@vueuse/components';
 import { useI18n } from 'vue-i18n';
-import { useMapGetter } from 'dashboard/composables/store.js';
 
 import Button from 'dashboard/components-next/button/Button.vue';
+import TeleportWithDirection from 'dashboard/components-next/TeleportWithDirection.vue';
 
 const props = defineProps({
   type: {
@@ -59,8 +59,6 @@ const emit = defineEmits(['confirm', 'close']);
 
 const { t } = useI18n();
 
-const isRTL = useMapGetter('accounts/isRTL');
-
 const dialogRef = ref(null);
 const dialogContentRef = ref(null);
 
@@ -94,7 +92,7 @@ defineExpose({ open, close });
 </script>
 
 <template>
-  <Teleport to="body">
+  <TeleportWithDirection to="body">
     <dialog
       ref="dialogRef"
       class="w-full transition-all duration-300 ease-in-out shadow-xl rounded-xl"
@@ -102,7 +100,6 @@ defineExpose({ open, close });
         maxWidthClass,
         overflowYAuto ? 'overflow-y-auto' : 'overflow-visible',
       ]"
-      :dir="isRTL ? 'rtl' : 'ltr'"
       @close="close"
     >
       <OnClickOutside @trigger="close">
@@ -152,7 +149,7 @@ defineExpose({ open, close });
         </form>
       </OnClickOutside>
     </dialog>
-  </Teleport>
+  </TeleportWithDirection>
 </template>
 
 <style scoped>
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index dc18ddd66..5aaf46808 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -8,6 +8,7 @@ import {
   computed,
   watch,
   onMounted,
+  onUnmounted,
   defineEmits,
 } from 'vue';
 import { useStore } from 'vuex';
@@ -29,6 +30,7 @@ import ConversationItem from './ConversationItem.vue';
 import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCustomViews.vue';
 import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Index.vue';
 import IntersectionObserver from './IntersectionObserver.vue';
+import TeleportWithDirection from 'dashboard/components-next/TeleportWithDirection.vue';
 
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { useAlert } from 'dashboard/composables';
@@ -42,7 +44,7 @@ import {
   useSnakeCase,
 } from 'dashboard/composables/useTransformKeys';
 import { useEmitter } from 'dashboard/composables/emitter';
-import { useEventListener } from '@vueuse/core';
+import { useEventListener, useScrollLock } from '@vueuse/core';
 
 import { emitter } from 'shared/helpers/mitt';
 
@@ -85,6 +87,12 @@ const store = useStore();
 
 const conversationListRef = ref(null);
 const conversationDynamicScroller = ref(null);
+const conversationListScrollableElement = computed(
+  () => conversationDynamicScroller.value?.$el
+);
+const conversationListScrollLock = useScrollLock(
+  conversationListScrollableElement
+);
 
 const activeAssigneeTab = ref(wootConstants.ASSIGNEE_TYPE.ME);
 const activeStatus = ref(wootConstants.STATUS_TYPE.OPEN);
@@ -738,6 +746,7 @@ function allSelectedConversationsStatus(status) {
 
 function onContextMenuToggle(state) {
   isContextMenuOpen.value = state;
+  conversationListScrollLock.value = state;
 }
 
 function toggleSelectAll(check) {
@@ -761,6 +770,10 @@ onMounted(() => {
   }
 });
 
+onUnmounted(() => {
+  conversationListScrollLock.value = false;
+});
+
 provide('selectConversation', selectConversation);
 provide('deSelectConversation', deSelectConversation);
 provide('assignAgent', onAssignAgent);
@@ -828,14 +841,17 @@ watch(conversationFilters, (newVal, oldVal) => {
       @basic-filter-change="onBasicFilterChange"
     />
 
-    <Teleport v-if="showAddFoldersModal" to="#saveFilterTeleportTarget">
+    <TeleportWithDirection
+      v-if="showAddFoldersModal"
+      to="#saveFilterTeleportTarget"
+    >
       <SaveCustomView
         v-model="appliedFilter"
         :custom-views-query="foldersQuery"
         :open-last-saved-item="openLastSavedItemInFolder"
         @close="onCloseAddFoldersModal"
       />
-    </Teleport>
+    </TeleportWithDirection>
 
     <DeleteCustomViews
       v-if="showDeleteFoldersModal"
@@ -932,7 +948,10 @@ watch(conversationFilters, (newVal, oldVal) => {
         </template>
       </DynamicScroller>
     </div>
-    <Teleport v-if="showAdvancedFilters" to="#conversationFilterTeleportTarget">
+    <TeleportWithDirection
+      v-if="showAdvancedFilters"
+      to="#conversationFilterTeleportTarget"
+    >
       <ConversationFilter
         v-model="appliedFilter"
         :folder-name="activeFolderName"
@@ -941,6 +960,6 @@ watch(conversationFilters, (newVal, oldVal) => {
         @update-folder="onUpdateSavedFilter"
         @close="closeAdvanceFiltersModal"
       />
-    </Teleport>
+    </TeleportWithDirection>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components/ui/ContextMenu.vue b/app/javascript/dashboard/components/ui/ContextMenu.vue
index 8b77ce254..e75e9bae7 100644
--- a/app/javascript/dashboard/components/ui/ContextMenu.vue
+++ b/app/javascript/dashboard/components/ui/ContextMenu.vue
@@ -2,6 +2,8 @@
 import { computed, onMounted, nextTick, useTemplateRef } from 'vue';
 import { useWindowSize, useElementBounding } from '@vueuse/core';
 
+import TeleportWithDirection from 'dashboard/components-next/TeleportWithDirection.vue';
+
 const props = defineProps({
   x: { type: Number, default: 0 },
   y: { type: Number, default: 0 },
@@ -57,7 +59,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <Teleport to="body">
+  <TeleportWithDirection to="body">
     <div
       ref="menuRef"
       class="fixed outline-none z-[9999] cursor-pointer"
@@ -67,5 +69,5 @@ onMounted(() => {
     >
       <slot />
     </div>
-  </Teleport>
+  </TeleportWithDirection>
 </template>
diff --git a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
index f5aa1e556..152f3c0a1 100644
--- a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
@@ -11,6 +11,7 @@ import { downloadFile } from '@chatwoot/utils';
 
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+import TeleportWithDirection from 'dashboard/components-next/TeleportWithDirection.vue';
 
 const props = defineProps({
   attachment: {
@@ -166,7 +167,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <Teleport to="body">
+  <TeleportWithDirection to="body">
     <woot-modal
       v-model:show="show"
       full-width
@@ -258,7 +259,7 @@ onMounted(() => {
           <div class="flex items-center justify-center w-16 shrink-0">
             <NextButton
               v-if="hasMoreThanOneAttachment"
-              icon="i-lucide-chevron-left"
+              icon="ltr:i-lucide-chevron-left rtl:i-lucide-chevron-right"
               class="z-10"
               blue
               faded
@@ -324,7 +325,7 @@ onMounted(() => {
           <div class="flex items-center justify-center w-16 shrink-0">
             <NextButton
               v-if="hasMoreThanOneAttachment"
-              icon="i-lucide-chevron-right"
+              icon="ltr:i-lucide-chevron-right rtl:i-lucide-chevron-left"
               class="z-10"
               blue
               faded
@@ -351,5 +352,5 @@ onMounted(() => {
         </footer>
       </div>
     </woot-modal>
-  </Teleport>
+  </TeleportWithDirection>
 </template>
diff --git a/app/javascript/dashboard/i18n/locale/am/components.json b/app/javascript/dashboard/i18n/locale/am/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/am/components.json
+++ b/app/javascript/dashboard/i18n/locale/am/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/am/generalSettings.json b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/am/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/am/integrations.json b/app/javascript/dashboard/i18n/locale/am/integrations.json
index f1a1d42c2..0e3c46b97 100644
--- a/app/javascript/dashboard/i18n/locale/am/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/am/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/components.json b/app/javascript/dashboard/i18n/locale/ar/components.json
index 6a4b2f4cb..e06f11d82 100644
--- a/app/javascript/dashboard/i18n/locale/ar/components.json
+++ b/app/javascript/dashboard/i18n/locale/ar/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "اعرف المزيد",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index 694f4dc59..903aee499 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "معرف الحساب",
         "NOTE": "هذا المعرف مطلوب إذا كنت بصدد بناء تكامل على API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "اسم الحساب",
         "PLACEHOLDER": "اسم الحساب الخاص بك",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "عنوان البريد الإلكتروني الخاص باستقبال رسائل الدعم الفني",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "عدد الأيام للتذكرة التي يجب أن يتم حلها تلقائياً إذا لم يكن هناك أي نشاط",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "الرجاء إدخال مدة صالحة للحل تلقائي (حد أدنى 1 يوم والحد الأقصى 999 يوما)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "تحديث",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "الاستمرار في المحادثة عبر رسائل البريد الإلكتروني مفعّل لحسابك.",
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index 24e64a972..0066dfec8 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "تم تحديث الرسالة",
             "WEBWIDGET_TRIGGERED": "أداة الدردشة المباشرة مفتوحة من قبل المستخدم",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/az/components.json b/app/javascript/dashboard/i18n/locale/az/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/az/components.json
+++ b/app/javascript/dashboard/i18n/locale/az/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/az/generalSettings.json b/app/javascript/dashboard/i18n/locale/az/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/az/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/az/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/az/integrations.json b/app/javascript/dashboard/i18n/locale/az/integrations.json
index f1a1d42c2..0e3c46b97 100644
--- a/app/javascript/dashboard/i18n/locale/az/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/az/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/components.json b/app/javascript/dashboard/i18n/locale/bg/components.json
index 2bba5bc01..cb087f380 100644
--- a/app/javascript/dashboard/i18n/locale/bg/components.json
+++ b/app/javascript/dashboard/i18n/locale/bg/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index 3cdafe2fe..73060096b 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/integrations.json b/app/javascript/dashboard/i18n/locale/bg/integrations.json
index 3bbc0bf71..67ba67f7b 100644
--- a/app/javascript/dashboard/i18n/locale/bg/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bg/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/components.json b/app/javascript/dashboard/i18n/locale/ca/components.json
index b45eb74fb..11623bd86 100644
--- a/app/javascript/dashboard/i18n/locale/ca/components.json
+++ b/app/javascript/dashboard/i18n/locale/ca/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Aprèn més",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index adca9cca9..9abfc8245 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID del compte",
         "NOTE": "Aquest identificador és necessari si esteu creant una integració basada en API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nom del compte",
         "PLACEHOLDER": "El nom del vostre compte",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Correu electrònic d'assistència de la vostra companya",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "El nombre de dies després que un ticket es resolgui automàticament si no hi ha activitat",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Introduïu una durada de resolució automàtica vàlida (mínim 1 dia i màxim 999 dies)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Actualitza",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuïtat de converses amb correus electrònics està habilitada per al vostre compte.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index 76a028c64..5190d1e70 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Missatge actualitzat",
             "WEBWIDGET_TRIGGERED": "Widget de xat en directe obert per l'usuari",
             "CONTACT_CREATED": "Contacte creat",
-            "CONTACT_UPDATED": "Contacte actualitzat"
+            "CONTACT_UPDATED": "Contacte actualitzat",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/components.json b/app/javascript/dashboard/i18n/locale/cs/components.json
index 847cdee59..480c7e626 100644
--- a/app/javascript/dashboard/i18n/locale/cs/components.json
+++ b/app/javascript/dashboard/i18n/locale/cs/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index 61765145c..796ff57ae 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Název účtu",
         "PLACEHOLDER": "Název vašeho účtu",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "E-mail podpory vaší společnosti",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Počet dnů, po kterých by měl být ticket automaticky vyřešen při žádné aktivitě",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Aktualizovat",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "E-mailová konverzace je u vašeho účtu povolena.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index 2671155ae..6b0c8772a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/da/components.json b/app/javascript/dashboard/i18n/locale/da/components.json
index 1ce510edc..7905f51e6 100644
--- a/app/javascript/dashboard/i18n/locale/da/components.json
+++ b/app/javascript/dashboard/i18n/locale/da/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Lær mere",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 58c1a7a2e..24261f9b9 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Konto SID",
         "NOTE": "Dette ID er påkrævet, hvis du bygger en API-baseret integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Kontonavn",
         "PLACEHOLDER": "Dit kontonavn",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Din virksomheds support e-mail",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Antal dage efter en ticket skal løses automatisk, hvis der ikke er nogen aktivitet",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 dag og maksimum 999 dage)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Opdater",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Samtale kontinuitet med e-mails er aktiveret for din konto.",
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index 1a0de11ae..da3a5345a 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Besked opdateret",
             "WEBWIDGET_TRIGGERED": "Live chat widget åbnet af brugeren",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/de/components.json b/app/javascript/dashboard/i18n/locale/de/components.json
index 3ef5c8fe8..e9497cd02 100644
--- a/app/javascript/dashboard/i18n/locale/de/components.json
+++ b/app/javascript/dashboard/i18n/locale/de/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Mehr erfahren",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index bfc4a912a..8427db1bc 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "Diese ID ist erforderlich, wenn Sie eine API-basierte Integration erstellen"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Kontobezeichnung",
         "PLACEHOLDER": "Ihr Kontoname",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Die Support-E-Mail Ihres Unternehmens",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Anzahl der Tage, nach denen ein Ticket automatisch geschlossen wird, wenn keine Aktivität erfolgt",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Bitte geben Sie eine gültige Dauer für die automatische Auflösung ein (mindestens 1Tag und maximal 999Tage)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Aktualisieren",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Konversationskontinuität mit E-Mails ist für Ihr Konto aktiviert.",
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index d63dd7d5c..77d6f154c 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Nachricht aktualisiert",
             "WEBWIDGET_TRIGGERED": "Vom Benutzer geöffnetes Live-Chat-Widget",
             "CONTACT_CREATED": "Kontakt erstellt",
-            "CONTACT_UPDATED": "Kontakt aktualisiert"
+            "CONTACT_UPDATED": "Kontakt aktualisiert",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/el/components.json b/app/javascript/dashboard/i18n/locale/el/components.json
index 2e0f6c686..0e08a569b 100644
--- a/app/javascript/dashboard/i18n/locale/el/components.json
+++ b/app/javascript/dashboard/i18n/locale/el/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Μάθετε περισσότερα",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index eef4753fe..a2887abf8 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID Λογαριασμού",
         "NOTE": "Αυτό το ID απαιτείται αν δημιουργείτε μια ενσωμάτωση βασισμένη στο API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Ονομασία Λογαριασμού",
         "PLACEHOLDER": "Η ονομασία του Λογαριασμού σας",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "To email υποστήριξης της εταιρίας σας",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Αριθμός ημερών μετά τις οποίες η συνομιλία θα επιλύεται αυτόματα, αν δεν υπάρχει δραστηριότητα",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διάρκεια αυτόματης επίλυσης (ελάχιστο 1 ημέρα και μέγιστο 999 ημέρες)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Ενημέρωση",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Η συνέχεια της συνομιλίας με emails έχει ενεργοποιηθεί για τον λογαριασμό.",
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index 97094d3b4..c8392f58d 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Το μήνυμα ενημερώθηκε",
             "WEBWIDGET_TRIGGERED": "Το widget συνομιλίας άνοιξε από τον χρήστη",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index e586fe761..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -46,7 +46,7 @@
       },
       "AUTO_RESOLVE": {
         "TITLE": "Auto-resolve conversations",
-        "NOTE": "This configuration would allow you to automatically end the conversation after a certain period. Set the duration and customize the message to the user below."
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
       },
       "NAME": {
         "LABEL": "Account name",
@@ -68,16 +68,20 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Inactivity duration for resolution",
         "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
         "API": {
           "SUCCESS": "Auto resolve settings updated successfully",
           "ERROR": "Failed to update auto resolve settings"
         },
-        "UPDATE_BUTTON": "Update Auto-resolve",
+        "UPDATE_BUTTON": "Update",
         "MESSAGE_LABEL": "Custom resolution message",
         "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
         "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 76dd56e49..9767df3ad 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/es/components.json b/app/javascript/dashboard/i18n/locale/es/components.json
index 67564e605..79764eadc 100644
--- a/app/javascript/dashboard/i18n/locale/es/components.json
+++ b/app/javascript/dashboard/i18n/locale/es/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Más información",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 8e79d1912..5812fe5dd 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID de Cuenta",
         "NOTE": "Este ID es necesario si estás construyendo una integración basada en API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nombre de cuenta",
         "PLACEHOLDER": "Tu nombre de cuenta",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Email de soporte de su empresa",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Número de días después de que un ticket se resuelva automáticamente si no hay actividad",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor introduzca una duración válida de resolución automática (mínimo 1 día y máximo 999 días)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Actualizar",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuidad de la conversación con emails está habilitada para su cuenta.",
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 0d205336f..905226810 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Mensaje actualizado",
             "WEBWIDGET_TRIGGERED": "Widget de Live Chat abierto por el usuario",
             "CONTACT_CREATED": "Contacto creado",
-            "CONTACT_UPDATED": "Contacto actualizado"
+            "CONTACT_UPDATED": "Contacto actualizado",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/components.json b/app/javascript/dashboard/i18n/locale/fa/components.json
index c4b5cd813..13c553711 100644
--- a/app/javascript/dashboard/i18n/locale/fa/components.json
+++ b/app/javascript/dashboard/i18n/locale/fa/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "بیشتر بدانید",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 67f66385a..d902a227d 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "شناسه حساب‌کاربری",
         "NOTE": "اگر شما در حال ساخت یک یکپارچه‌سازی مبتنی بر API هستید، این شناسه مورد نیاز است"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "نام حساب‌کاربری",
         "PLACEHOLDER": "نام حساب‌کاربری شما",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "ایمیل پشتیبانی شرکت شما",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "تعداد روزهایی که اگر فعالیتی وجود نداشته باشد، گفتگو به صورت خودکار بسته شود",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "۳۰",
-        "ERROR": "لطفا یک مدت زمان حل خودکار معبر (بین حداقل 1 روز تا حداکثر 999 روز) وارد کنید"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "اعمال شود",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "تداوم مکالمه با ایمیل برای حساب شما فعال است.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 01e113aa6..9ee1fc854 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "پیام به روز شد",
             "WEBWIDGET_TRIGGERED": "ابزارک گفتگو زنده توسط کاربر باز شده است",
             "CONTACT_CREATED": "مخاطب ایجاد شد",
-            "CONTACT_UPDATED": "مخاطب به‌روزرسانی شد"
+            "CONTACT_UPDATED": "مخاطب به‌روزرسانی شد",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/components.json b/app/javascript/dashboard/i18n/locale/fi/components.json
index 916b21a31..4270da3d8 100644
--- a/app/javascript/dashboard/i18n/locale/fi/components.json
+++ b/app/javascript/dashboard/i18n/locale/fi/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index e9d085363..2e1235069 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Tilin nimi",
         "PLACEHOLDER": "Tilisi nimi",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Yrityksesi tukisähköposti",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Kuinka monen päivän jälkeen tukipyyntö suljetaan automaattisesti, mikäli sillä ei ole toimintaa",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Päivitä",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Keskustelun jatkuvuus sähköpostin kautta on käytössä tililläsi.",
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index 6f749c74b..1d7ec60c0 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/agentBots.json b/app/javascript/dashboard/i18n/locale/fr/agentBots.json
index a5feea3b7..aed48e91d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/fr/agentBots.json
@@ -2,13 +2,13 @@
   "AGENT_BOTS": {
     "HEADER": "Bots",
     "LOADING_EDITOR": "Chargement de l'éditeur...",
-    "DESCRIPTION": "Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try. You can manage your bots from this page or create new ones using the 'Add Bot' button.",
+    "DESCRIPTION": "Les bots agents sont comme les membres les plus formidables de votre équipe. Ils peuvent gérer les petites tâches, vous permettant ainsi de vous concentrer sur ce qui compte vraiment. Essayez-les. Vous pouvez gérer vos bots depuis cette page ou en créer de nouveaux en cliquant sur le bouton 'Ajouter un bot'.",
     "LEARN_MORE": "Learn about agent bots",
-    "GLOBAL_BOT": "System bot",
+    "GLOBAL_BOT": "Bot système",
     "GLOBAL_BOT_BADGE": "Système",
     "AVATAR": {
-      "SUCCESS_DELETE": "Bot avatar deleted successfully",
-      "ERROR_DELETE": "Error deleting bot avatar, please try again"
+      "SUCCESS_DELETE": "Avatar du bot supprimé avec succès",
+      "ERROR_DELETE": "Erreur lors de la suppression de l’avatar du bot, veuillez réessayer"
     },
     "BOT_CONFIGURATION": {
       "TITLE": "Sélectionnez un bot d'agent",
@@ -22,7 +22,7 @@
       "SELECT_PLACEHOLDER": "Sélectionner le bot"
     },
     "ADD": {
-      "TITLE": "Add Bot",
+      "TITLE": "Ajouter un bot",
       "CANCEL_BUTTON_TEXT": "Annuler",
       "API": {
         "SUCCESS_MESSAGE": "Le bot a été ajouté avec succès.",
@@ -30,10 +30,10 @@
       }
     },
     "LIST": {
-      "404": "No bots found. You can create a bot by clicking the 'Add Bot' button.",
+      "404": "Aucun bot trouvé. Vous pouvez en créer un en cliquant sur le bouton 'Ajouter un bot'.",
       "LOADING": "Récupération des bots...",
       "TABLE_HEADER": {
-        "DETAILS": "Bot Details",
+        "DETAILS": "Détails du bot",
         "URL": "URL du Webhook"
       }
     },
@@ -42,7 +42,7 @@
       "TITLE": "Supprimer le bot",
       "CONFIRM": {
         "TITLE": "Confirmer la suppression",
-        "MESSAGE": "Are you sure you want to delete {name}?",
+        "MESSAGE": "Êtes-vous sûr de vouloir supprimer {name} ?",
         "YES": "Oui, supprimer",
         "NO": "Non, Conserver"
       },
@@ -61,11 +61,11 @@
     },
     "FORM": {
       "AVATAR": {
-        "LABEL": "Bot avatar"
+        "LABEL": "Avatar du bot"
       },
       "NAME": {
         "LABEL": "Nom du bot",
-        "PLACEHOLDER": "Enter bot name",
+        "PLACEHOLDER": "Entrez le nom du bot",
         "REQUIRED": "Le nom du bot est requis"
       },
       "DESCRIPTION": {
@@ -75,19 +75,19 @@
       "WEBHOOK_URL": {
         "LABEL": "URL du Webhook",
         "PLACEHOLDER": "https://example.com/webhook",
-        "REQUIRED": "Webhook URL is required"
+        "REQUIRED": "L'URL du webhook est requise"
       },
       "ERRORS": {
         "NAME": "Le nom du bot est requis",
-        "URL": "Webhook URL is required",
-        "VALID_URL": "Please enter a valid URL starting with http:// or https://"
+        "URL": "L'URL du webhook est requise",
+        "VALID_URL": "Veuillez entrer une URL valide commençant par http:// ou https://"
       },
       "CANCEL": "Annuler",
-      "CREATE": "Create Bot",
-      "UPDATE": "Update Bot"
+      "CREATE": "Créer un bot",
+      "UPDATE": "Mettre à jour le bot"
     },
     "WEBHOOK": {
-      "DESCRIPTION": "Configure a webhook bot to integrate with your custom services. The bot will receive and process events from conversations and can respond to them."
+      "DESCRIPTION": "Configurez un bot webhook pour l'intégration avec vos services personnalisés. Le bot recevra et traitera les événements des conversations et pourra y répondre."
     },
     "TYPES": {
       "WEBHOOK": "Webhook Bot"
diff --git a/app/javascript/dashboard/i18n/locale/fr/automation.json b/app/javascript/dashboard/i18n/locale/fr/automation.json
index ead02076c..c2c657a54 100644
--- a/app/javascript/dashboard/i18n/locale/fr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/automation.json
@@ -130,37 +130,37 @@
     "EVENTS": {
       "CONVERSATION_CREATED": "Conversation créée",
       "CONVERSATION_UPDATED": "Conversation mise à jour",
-      "MESSAGE_CREATED": "Message Created",
-      "CONVERSATION_OPENED": "Conversation Opened"
+      "MESSAGE_CREATED": "Message créé",
+      "CONVERSATION_OPENED": "Conversation ouverte"
     },
     "ACTIONS": {
-      "ASSIGN_AGENT": "Assign to Agent",
-      "ASSIGN_TEAM": "Assign a Team",
-      "ADD_LABEL": "Add a Label",
-      "REMOVE_LABEL": "Remove a Label",
-      "SEND_EMAIL_TO_TEAM": "Send an Email to Team",
-      "SEND_EMAIL_TRANSCRIPT": "Send an Email Transcript",
+      "ASSIGN_AGENT": "Assigner à un agent",
+      "ASSIGN_TEAM": "Assigner une équipe",
+      "ADD_LABEL": "Ajouter une étiquette",
+      "REMOVE_LABEL": "Supprimer une étiquette",
+      "SEND_EMAIL_TO_TEAM": "Envoyer un e-mail à l'équipe",
+      "SEND_EMAIL_TRANSCRIPT": "Envoyer une transcription par e-mail",
       "MUTE_CONVERSATION": "Mettre la conversation en sourdine",
       "SNOOZE_CONVERSATION": "Clôturer la conversation",
       "RESOLVE_CONVERSATION": "Résoudre la conversation",
-      "SEND_WEBHOOK_EVENT": "Send Webhook Event",
-      "SEND_ATTACHMENT": "Send Attachment",
-      "SEND_MESSAGE": "Send a Message",
+      "SEND_WEBHOOK_EVENT": "Envoyer un événement Webhook",
+      "SEND_ATTACHMENT": "Envoyer la pièce jointe",
+      "SEND_MESSAGE": "Envoyer un message",
       "CHANGE_PRIORITY": "Modifier la priorité",
       "ADD_SLA": "Add SLA"
     },
     "ATTRIBUTES": {
-      "MESSAGE_TYPE": "Message Type",
-      "MESSAGE_CONTAINS": "Message Contains",
+      "MESSAGE_TYPE": "Type de message",
+      "MESSAGE_CONTAINS": "Le message contient",
       "EMAIL": "Courriel",
       "INBOX": "Boîte de réception",
-      "CONVERSATION_LANGUAGE": "Conversation Language",
+      "CONVERSATION_LANGUAGE": "Langue de la conversation",
       "PHONE_NUMBER": "Numéro de téléphone",
       "STATUS": "État",
       "BROWSER_LANGUAGE": "Langue du navigateur",
-      "MAIL_SUBJECT": "Email Subject",
+      "MAIL_SUBJECT": "Objet de l'email",
       "COUNTRY_NAME": "Pays",
-      "REFERER_LINK": "Referrer Link",
+      "REFERER_LINK": "Lien de référence",
       "ASSIGNEE_NAME": "Assignee",
       "TEAM_NAME": "Équipes",
       "PRIORITY": "Priorité"
diff --git a/app/javascript/dashboard/i18n/locale/fr/components.json b/app/javascript/dashboard/i18n/locale/fr/components.json
index 6048fd367..41e6a1b0d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/components.json
+++ b/app/javascript/dashboard/i18n/locale/fr/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "En savoir plus",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Heures",
+    "DAYS": "Jours",
+    "PLACEHOLDER": "Entrez la durée"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 3243652a0..ab416438d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -545,8 +545,8 @@
         "YOU": "Vous",
         "SAVE": "Save note",
         "EXPAND": "Développer",
-        "COLLAPSE": "Collapse",
-        "NO_NOTES": "No notes, you can add notes from the contact details page.",
+        "COLLAPSE": "Réduire",
+        "NO_NOTES": "Pas de notes, vous pouvez en ajouter depuis la page des détails du contact.",
         "EMPTY_STATE": "There are no notes associated to this contact. You can add a note by typing in the box above."
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index 8918e427e..7471f9850 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -32,12 +32,12 @@
     "LOADING_CONVERSATIONS": "Chargement des conversations",
     "CANNOT_REPLY": "Vous ne pouvez pas répondre en raison de",
     "24_HOURS_WINDOW": "Restriction de fenêtre de message de 24 heures",
-    "API_HOURS_WINDOW": "You can only reply to this conversation within {hours} hours",
+    "API_HOURS_WINDOW": "Vous ne pouvez répondre à cette conversation que dans un délai de {hours} heures",
     "NOT_ASSIGNED_TO_YOU": "Cette conversation ne vous est pas assignée. Voulez-vous vous assigner cette conversation ?",
     "ASSIGN_TO_ME": "M’assigner la conversation",
     "TWILIO_WHATSAPP_CAN_REPLY": "Vous pouvez seulement répondre à cette conversation en utilisant un modèle de message en raison de",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restriction de fenêtre de message de 24 heures",
-    "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "This Instagram account was migrated to the new Instagram channel inbox. All new messages will show up there. You won’t be able to send messages from this conversation anymore.",
+    "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "Ce compte Instagram a été migré vers la nouvelle boîte de réception du canal Instagram. Tous les nouveaux messages y apparaîtront. Vous ne pourrez plus envoyer de messages depuis cette conversation.",
     "REPLYING_TO": "Vous répondez à :",
     "REMOVE_SELECTION": "Supprimer la sélection",
     "DOWNLOAD": "Télécharger",
@@ -295,7 +295,7 @@
       "CONVERSATION_ACTIONS": "Actions de conversation",
       "CONVERSATION_LABELS": "Étiquettes de conversation",
       "CONVERSATION_INFO": "Informations de la conversation",
-      "CONTACT_NOTES": "Contact Notes",
+      "CONTACT_NOTES": "Notes du contact",
       "CONTACT_ATTRIBUTES": "Attributs du contact",
       "PREVIOUS_CONVERSATION": "Conversations précédentes",
       "MACROS": "Macros",
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index cbad750f0..6a8bee06d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -1,10 +1,10 @@
 {
   "GENERAL_SETTINGS": {
     "LIMIT_MESSAGES": {
-      "CONVERSATION": "You have exceeded the conversation limit. Hacker plan allows only 500 conversations.",
-      "INBOXES": "You have exceeded the inbox limit. Hacker plan only supports website live-chat. Additional inboxes like email, WhatsApp etc. require a paid plan.",
-      "AGENTS": "You have exceeded the agent limit. Hacker plan allows only 2 agents.",
-      "NON_ADMIN": "Please contact your administrator to upgrade the plan and continue using all features."
+      "CONVERSATION": "Vous avez dépassé la limite de conversation. Le plan Hacker autorise uniquement 500 conversations.",
+      "INBOXES": "Vous avez dépassé la limite de boîtes de réception. Le plan Hacker ne prend en charge que le chat en direct sur le site Web. Des boîtes de réception supplémentaires telles que l'email, WhatsApp, etc. nécessitent un plan payant.",
+      "AGENTS": "Vous avez dépassé la limite d'agents. Le plan Hacker permet uniquement 2 agents.",
+      "NON_ADMIN": "Veuillez contacter votre administrateur pour mettre à niveau le plan et continuer à utiliser toutes les fonctionnalités."
     },
     "TITLE": "Paramètres du compte",
     "SUBMIT": "Mettre à jour les paramètres",
@@ -16,22 +16,22 @@
     },
     "ACCOUNT_DELETE_SECTION": {
       "TITLE": "Supprimer votre compte",
-      "NOTE": "Once you delete your account, all your data will be deleted.",
+      "NOTE": "Une fois que vous supprimez votre compte, toutes vos données seront supprimées.",
       "BUTTON_TEXT": "Supprimer votre compte",
       "CONFIRM": {
-        "TITLE": "Delete Account",
+        "TITLE": "Supprimer le compte",
         "MESSAGE": "La suppression de votre compte est irréversible. Entrez votre nom de compte ci-dessous pour confirmer que vous souhaitez le supprimer définitivement.",
         "BUTTON_TEXT": "Supprimer",
         "DISMISS": "Annuler",
         "PLACE_HOLDER": "Veuillez entrer {accountName} pour confirmer"
       },
-      "SUCCESS": "Account marked for deletion",
+      "SUCCESS": "Compte marqué pour suppression",
       "FAILURE": "Impossible de supprimer le compte, essayez à nouveau !",
       "SCHEDULED_DELETION": {
-        "TITLE": "Account Scheduled for Deletion",
-        "MESSAGE_MANUAL": "This account is scheduled for deletion on {deletionDate}. This was requested by an administrator. You can cancel the deletion before this date.",
-        "MESSAGE_INACTIVITY": "This account is scheduled for deletion on {deletionDate} due to account inactivity. You can cancel the deletion before this date.",
-        "CLEAR_BUTTON": "Cancel Scheduled Deletion"
+        "TITLE": "Compte programmé pour suppression",
+        "MESSAGE_MANUAL": "Ce compte est programmé pour suppression le {deletionDate}. Cette demande a été effectuée par un administrateur. Vous pouvez annuler la suppression avant cette date.",
+        "MESSAGE_INACTIVITY": "Ce compte est programmé pour suppression le {deletionDate} en raison de l'inactivité du compte. Vous pouvez annuler la suppression avant cette date.",
+        "CLEAR_BUTTON": "Annuler la suppression programmée"
       }
     },
     "FORM": {
@@ -44,6 +44,10 @@
         "TITLE": "ID de compte",
         "NOTE": "Cet identifiant est requis si vous construisez une intégration basée sur l'API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Résolution automatique des conversations",
+        "NOTE": "Cette configuration vous permet de résoudre automatiquement la conversation après un certain délai. Définissez la durée et personnalisez le message à l'utilisateur ci-dessous."
+      },
       "NAME": {
         "LABEL": "Nom du compte",
         "PLACEHOLDER": "Votre nom de compte",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "L'adresse de courriel de support de votre entreprise",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclure les conversations non prises en charge",
+        "HELP": "Lorsque cette option est activée, le système ignorera la résolution des conversations qui attendent toujours une réponse d'un agent."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Nombre de jours après qu'un ticket soit automatiquement résolu s'il n'y a pas d'activité",
+        "LABEL": "Durée d'inactivité avant résolution",
+        "HELP": "Durée après laquelle une conversation doit être automatiquement résolue s'il n'y a pas d'activité",
         "PLACEHOLDER": "30",
-        "ERROR": "Veuillez entrer une durée de résolution automatique valide (minimum 1 jour et maximum 999 jours)"
+        "ERROR": "La durée de résolution automatique doit être comprise entre 10 minutes et 999 jours",
+        "API": {
+          "SUCCESS": "Paramètres de résolution automatique mis à jour avec succès",
+          "ERROR": "Échec de la mise à jour des paramètres de résolution automatique"
+        },
+        "UPDATE_BUTTON": "Mettre à jour",
+        "MESSAGE_LABEL": "Message de résolution personnalisé",
+        "MESSAGE_PLACEHOLDER": "La conversation a été marquée comme résolue par le système en raison de 15 jours d'inactivité",
+        "MESSAGE_HELP": "Ce message est envoyé au client lorsque la conversation est automatiquement résolue par le système en raison d'une inactivité."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuité des conversations avec les courriels est activée pour votre compte.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
index 642f9c5aa..af3ba4da2 100644
--- a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
@@ -697,7 +697,7 @@
         "LABEL": "Slug",
         "PLACEHOLDER": "user-guide",
         "ERROR": "Le Slug est requis",
-        "FORMAT_ERROR": "Please enter a valid slug, for eg: user-guide"
+        "FORMAT_ERROR": "Veuillez saisir un identifiant valide, par exemple : guide-utilisateur"
       }
     },
     "PORTAL_SETTINGS": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index 7f78655d2..e65aeebf6 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -47,13 +47,13 @@
         "CREATE_INBOX": "Créer une boîte de réception"
       },
       "INSTAGRAM": {
-        "CONTINUE_WITH_INSTAGRAM": "Continue with Instagram",
-        "CONNECT_YOUR_INSTAGRAM_PROFILE": "Connect your Instagram Profile",
-        "HELP": "To add your Instagram profile as a channel, you need to authenticate your Instagram Profile by clicking on 'Continue with Instagram' ",
-        "ERROR_MESSAGE": "There was an error connecting to Instagram, please try again",
-        "ERROR_AUTH": "There was an error connecting to Instagram, please try again",
-        "NEW_INBOX_SUGGESTION": "This Instagram account was previously linked to a different inbox and has now been migrated here. All new messages will appear here. The old inbox will no longer be able to send or receive messages for this account.",
-        "DUPLICATE_INBOX_BANNER": "This Instagram account was migrated to the new Instagram channel inbox. You won’t be able to send/receive Instagram messages from this inbox anymore."
+        "CONTINUE_WITH_INSTAGRAM": "Continuer avec Instagram",
+        "CONNECT_YOUR_INSTAGRAM_PROFILE": "Connectez votre profil Instagram",
+        "HELP": "Pour ajouter votre profil Instagram en tant que canal, vous devez authentifier votre profil Instagram en cliquant sur 'Continuer avec Instagram' ",
+        "ERROR_MESSAGE": "Une erreur est survenue lors de la connexion à Instagram, veuillez réessayer",
+        "ERROR_AUTH": "Une erreur est survenue lors de la connexion à Instagram, veuillez réessayer",
+        "NEW_INBOX_SUGGESTION": "Ce compte Instagram était précédemment lié à une autre boîte de réception et a maintenant été migré ici. Tous les nouveaux messages apparaîtront ici. L'ancienne boîte de réception ne pourra plus envoyer ni recevoir de messages pour ce compte.",
+        "DUPLICATE_INBOX_BANNER": "Ce compte Instagram a été migré vers la nouvelle boîte de réception du canal Instagram. Vous ne pourrez plus envoyer ni recevoir de messages Instagram depuis cette boîte de réception."
       },
       "TWITTER": {
         "HELP": "Pour ajouter votre profil Twitter en tant que canal, vous devez lier votre profil Twitter en cliquant sur 'Se connecter avec Twitter' ",
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 8a3341fc2..14d052530 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message mis à jour",
             "WEBWIDGET_TRIGGERED": "Widget de discussion instantanée ouvert par l'utilisateur",
             "CONTACT_CREATED": "Contact créé",
-            "CONTACT_UPDATED": "Contact mis à jour"
+            "CONTACT_UPDATED": "Contact mis à jour",
+            "CONVERSATION_TYPING_ON": "Saisie de conversation activée",
+            "CONVERSATION_TYPING_OFF": "Saisie de conversation désactivée"
           }
         },
         "END_POINT": {
@@ -329,7 +331,7 @@
     "HEADER_KNOW_MORE": "Know more",
     "COPILOT": {
       "SEND_MESSAGE": "Envoyer un message...",
-      "EMPTY_MESSAGE": "There was an error generating the response. Please try again.",
+      "EMPTY_MESSAGE": "Une erreur s'est produite lors de la génération de la réponse. Veuillez réessayer.",
       "LOADER": "Captain is thinking",
       "YOU": "Vous",
       "USE": "Use this",
@@ -337,16 +339,16 @@
       "SELECT_ASSISTANT": "Select Assistant",
       "PROMPTS": {
         "SUMMARIZE": {
-          "LABEL": "Summarize this conversation",
-          "CONTENT": "Summarize the key points discussed between the customer and the support agent, including the customer's concerns, questions, and the solutions or responses provided by the support agent"
+          "LABEL": "Résumer cette conversation",
+          "CONTENT": "Résumé des points clés de la conversation entre le client et l'agent de support, y compris les préoccupations et questions du client, ainsi que les solutions ou réponses fournies par l'agent de support"
         },
         "SUGGEST": {
-          "LABEL": "Suggest an answer",
-          "CONTENT": "Analyze the customer's inquiry, and draft a response that effectively addresses their concerns or questions. Ensure the reply is clear, concise, and provides helpful information."
+          "LABEL": "Suggérer une réponse",
+          "CONTENT": "Analysez la demande du client et rédigez une réponse qui traite efficacement ses préoccupations ou questions. Assurez-vous que la réponse soit claire, concise et fournisse des informations utiles."
         },
         "RATE": {
-          "LABEL": "Rate this conversation",
-          "CONTENT": "Review the conversation to see how well it meets the customer's needs. Share a rating out of 5 based on tone, clarity, and effectiveness."
+          "LABEL": "Évaluer cette conversation",
+          "CONTENT": "Revue de la conversation pour évaluer dans quelle mesure elle répond aux besoins du client. Partagez une note sur 5 en fonction du ton, de la clarté et de l'efficacité."
         }
       }
     },
@@ -354,9 +356,9 @@
       "USER": "Vous",
       "ASSISTANT": "Assistant",
       "MESSAGE_PLACEHOLDER": "Tapez votre message...",
-      "HEADER": "Playground",
-      "DESCRIPTION": "Use this playground to send messages to your assistant and check if it responds accurately, quickly, and in the tone you expect.",
-      "CREDIT_NOTE": "Messages sent here will count toward your Captain credits."
+      "HEADER": "Terrain de jeu",
+      "DESCRIPTION": "Utilisez ce terrain de jeu pour envoyer des messages à votre assistant et vérifier s'il répond de manière précise, rapide et dans le ton que vous attendez.",
+      "CREDIT_NOTE": "Les messages envoyés ici compteront pour vos crédits Captain."
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
@@ -398,42 +400,42 @@
       "FORM": {
         "UPDATE": "Mettre à jour",
         "SECTIONS": {
-          "BASIC_INFO": "Basic Information",
-          "SYSTEM_MESSAGES": "System Messages",
+          "BASIC_INFO": "Informations de base",
+          "SYSTEM_MESSAGES": "Messages système",
           "INSTRUCTIONS": "Instructions",
           "FEATURES": "Fonctionnalités",
-          "TOOLS": "Tools "
+          "TOOLS": "Outils "
         },
         "NAME": {
           "LABEL": "Nom",
-          "PLACEHOLDER": "Enter assistant name",
-          "ERROR": "The name is required"
+          "PLACEHOLDER": "Entrez le nom de l'assistant",
+          "ERROR": "Le nom est requis"
         },
         "DESCRIPTION": {
           "LABEL": "Description",
-          "PLACEHOLDER": "Enter assistant description",
-          "ERROR": "The description is required"
+          "PLACEHOLDER": "Entrez la description de l'assistant",
+          "ERROR": "La description est requise"
         },
         "PRODUCT_NAME": {
           "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter product name",
+          "PLACEHOLDER": "Entrez le nom du produit",
           "ERROR": "The product name is required"
         },
         "WELCOME_MESSAGE": {
-          "LABEL": "Welcome Message",
-          "PLACEHOLDER": "Enter welcome message"
+          "LABEL": "Message de bienvenue",
+          "PLACEHOLDER": "Entrez le message de bienvenue"
         },
         "HANDOFF_MESSAGE": {
-          "LABEL": "Handoff Message",
-          "PLACEHOLDER": "Enter handoff message"
+          "LABEL": "Message de transfert",
+          "PLACEHOLDER": "Entrez le message de transfert"
         },
         "RESOLUTION_MESSAGE": {
-          "LABEL": "Resolution Message",
-          "PLACEHOLDER": "Enter resolution message"
+          "LABEL": "Message de résolution",
+          "PLACEHOLDER": "Entrez le message de résolution"
         },
         "INSTRUCTIONS": {
           "LABEL": "Instructions",
-          "PLACEHOLDER": "Enter instructions for the assistant"
+          "PLACEHOLDER": "Entrez les instructions pour l'assistant"
         },
         "FEATURES": {
           "TITLE": "Fonctionnalités",
@@ -445,7 +447,7 @@
         "TITLE": "Update the assistant",
         "SUCCESS_MESSAGE": "The assistant has been successfully updated",
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
-        "NOT_FOUND": "Could not find the assistant. Please try again."
+        "NOT_FOUND": "Impossible de trouver l'assistant. Veuillez réessayer."
       },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/fr/macros.json b/app/javascript/dashboard/i18n/locale/fr/macros.json
index 8c1b3da23..33c0117e0 100644
--- a/app/javascript/dashboard/i18n/locale/fr/macros.json
+++ b/app/javascript/dashboard/i18n/locale/fr/macros.json
@@ -85,20 +85,20 @@
       "ATLEAST_ONE_ACTION_REQUIRED": "At least one action is required"
     },
     "ACTIONS": {
-      "ASSIGN_TEAM": "Assign a Team",
-      "ASSIGN_AGENT": "Assign an Agent",
-      "ADD_LABEL": "Add a Label",
-      "REMOVE_LABEL": "Remove a Label",
-      "REMOVE_ASSIGNED_TEAM": "Remove Assigned Team",
-      "SEND_EMAIL_TRANSCRIPT": "Send an Email Transcript",
+      "ASSIGN_TEAM": "Attribuer une équipe",
+      "ASSIGN_AGENT": "Attribuer un agent",
+      "ADD_LABEL": "Ajouter une étiquette",
+      "REMOVE_LABEL": "Supprimer une étiquette",
+      "REMOVE_ASSIGNED_TEAM": "Supprimer l’équipe assignée",
+      "SEND_EMAIL_TRANSCRIPT": "Envoyer une transcription par e-mail",
       "MUTE_CONVERSATION": "Mettre la conversation en sourdine",
       "SNOOZE_CONVERSATION": "Clôturer la conversation",
       "RESOLVE_CONVERSATION": "Résoudre la conversation",
-      "SEND_ATTACHMENT": "Send Attachment",
-      "SEND_MESSAGE": "Send a Message",
+      "SEND_ATTACHMENT": "Envoyer la pièce jointe",
+      "SEND_MESSAGE": "Envoyer un message",
       "CHANGE_PRIORITY": "Modifier la priorité",
-      "ADD_PRIVATE_NOTE": "Add a Private Note",
-      "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+      "ADD_PRIVATE_NOTE": "Ajouter une note privée",
+      "SEND_WEBHOOK_EVENT": "Envoyer un événement Webhook"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/components.json b/app/javascript/dashboard/i18n/locale/he/components.json
index b57658b6b..d2855b661 100644
--- a/app/javascript/dashboard/i18n/locale/he/components.json
+++ b/app/javascript/dashboard/i18n/locale/he/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "למד עוד",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 875fcc9de..2332e7d60 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "מזהה חשבון",
         "NOTE": "מזהה זה נדרש אם אתה בונה אינטגרציה מבוססת API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "שם החשבון",
         "PLACEHOLDER": "שם החשבון שלך",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "דוא\"ל התמיכה של החברה שלך",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "מספר הימים לאחר כרטיס אמור להיפתר אוטומטית אם אין פעילות",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "אנא הזן משך פתרון אוטומטי חוקי (מינימום יום אחד ומקסימום 999 ימים)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "עדכן",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "רציפות השיחה עם הודעות אימייל מופעלת עבור החשבון שלך.",
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
index 405e453c6..ec0c6960b 100644
--- a/app/javascript/dashboard/i18n/locale/he/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "ההודעה עודכנה",
             "WEBWIDGET_TRIGGERED": "ווידג'ט צ'אט חי נפתח על ידי המשתמש",
             "CONTACT_CREATED": "צור קשר",
-            "CONTACT_UPDATED": "איש קשר עודכן"
+            "CONTACT_UPDATED": "איש קשר עודכן",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/components.json b/app/javascript/dashboard/i18n/locale/hi/components.json
index 99d5bce1f..dea9e6b1a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/components.json
+++ b/app/javascript/dashboard/i18n/locale/hi/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index 01dbf5ef2..abe06bb05 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/components.json b/app/javascript/dashboard/i18n/locale/hr/components.json
index 26f1c8f51..cd32e5822 100644
--- a/app/javascript/dashboard/i18n/locale/hr/components.json
+++ b/app/javascript/dashboard/i18n/locale/hr/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
index f564e587f..5f0d0961d 100644
--- a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/hr/integrations.json b/app/javascript/dashboard/i18n/locale/hr/integrations.json
index 71642872c..506cafc4d 100644
--- a/app/javascript/dashboard/i18n/locale/hr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hr/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/components.json b/app/javascript/dashboard/i18n/locale/hu/components.json
index 2b57c01e9..f16dacaf8 100644
--- a/app/javascript/dashboard/i18n/locale/hu/components.json
+++ b/app/javascript/dashboard/i18n/locale/hu/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Tudj meg többet",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index 01215cee7..cefc92303 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Fiók Azonosító",
         "NOTE": "Ez a személyazonosság akkor használható, ha API-alapú integrációt építesz"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Fióknév",
         "PLACEHOLDER": "A fiókneved",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "A vállalati támogatási e-mailcímed",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "A napok száma, mely után a ticketek automatikusan megoldódnak, ha nincs aktivitás",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Kérjük helyes auto feloldási időszakot adj meg (minimum 1 nap, maximum 999 nap)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Frissítés",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A beszélgetésfolytonosság e-maillel már elérhető a fiókodban.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index 26f2edcd9..25cb95f2e 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Üzenet frissítve",
             "WEBWIDGET_TRIGGERED": "A felhasználó által megnyitott élő chat widget",
             "CONTACT_CREATED": "Kontakt létrehozva",
-            "CONTACT_UPDATED": "Kontakt frissítve"
+            "CONTACT_UPDATED": "Kontakt frissítve",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/components.json b/app/javascript/dashboard/i18n/locale/hy/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/hy/components.json
+++ b/app/javascript/dashboard/i18n/locale/hy/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/hy/integrations.json b/app/javascript/dashboard/i18n/locale/hy/integrations.json
index 5300c9239..e57ecb7cd 100644
--- a/app/javascript/dashboard/i18n/locale/hy/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hy/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/id/components.json b/app/javascript/dashboard/i18n/locale/id/components.json
index 04b44190e..4275c1226 100644
--- a/app/javascript/dashboard/i18n/locale/id/components.json
+++ b/app/javascript/dashboard/i18n/locale/id/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Pelajari lebih lanjut",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index 0b81a8ad6..8217969cf 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID Akun",
         "NOTE": "ID ini diperlukan jika Anda membangun integrasi berbasis API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nama Akun",
         "PLACEHOLDER": "Nama akun Anda",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Email dukungan perusahaan Anda",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Jumlah hari setelah tiket harus diselesaikan secara otomatis jika tidak ada aktivitas",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Harap masukkan durasi penyelesaian otomatis yang valid (minimal 1 hari dan maksimal 999 hari)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Perbarui",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Kelanjutan percakapan dengan email diaktifkan untuk akun Anda.",
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index a7b5acf20..01ff9e00a 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Pesan diperbarui",
             "WEBWIDGET_TRIGGERED": "Widget obrolan langsung dibuka oleh pengguna",
             "CONTACT_CREATED": "Kontak dibuat",
-            "CONTACT_UPDATED": "Kontak diperbarui"
+            "CONTACT_UPDATED": "Kontak diperbarui",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/is/components.json b/app/javascript/dashboard/i18n/locale/is/components.json
index b79a1441c..d71ecd858 100644
--- a/app/javascript/dashboard/i18n/locale/is/components.json
+++ b/app/javascript/dashboard/i18n/locale/is/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Læra meira",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
index 993ccaa37..d16bf6199 100644
--- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Númer aðgangs",
         "NOTE": "Þetta auðkenni er nauðsynlegt ef þú ert að byggja upp API byggða samþættingu"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Aðgangsnafn",
         "PLACEHOLDER": "Þitt aðgangsnafn",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Þjónustu tölvupóstur fyrirtækisins",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Fjöldi daga eftir miða ætti að leysast sjálfkrafa ef engin virkni er",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Vinsamlega sláðu inn gilda lengd sjálfvirkrar úrlausnar (lágmark 1 dagur og hámark 999 dagar)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Uppfæra",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Samfellu samtals með tölvupósti er virkjuð fyrir reikninginn þinn.",
diff --git a/app/javascript/dashboard/i18n/locale/is/integrations.json b/app/javascript/dashboard/i18n/locale/is/integrations.json
index c8407059c..5e0a47814 100644
--- a/app/javascript/dashboard/i18n/locale/is/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/is/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/it/components.json b/app/javascript/dashboard/i18n/locale/it/components.json
index 5fdad88ac..c1d5dfd8b 100644
--- a/app/javascript/dashboard/i18n/locale/it/components.json
+++ b/app/javascript/dashboard/i18n/locale/it/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Scopri di più",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index cb9be746b..96d45fb75 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID Account",
         "NOTE": "Questo ID è richiesto se si sta costruendo un'integrazione basata su API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nome account",
         "PLACEHOLDER": "Nome del tuo account",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Email di supporto della tua azienda",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Numero di giorni dopo che un ticket dovrebbe risolvere automaticamente se non c'è attività",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Inserisci una durata di risoluzione automatica valida (minimo 1 giorno e massimo 999 giorni)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Aggiorna",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuità della conversazione con le email è abilitata per il tuo account.",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index d7e5fe340..7ce30781d 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Messaggio aggiornato",
             "WEBWIDGET_TRIGGERED": "Widget live chat aperto dall'utente",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/components.json b/app/javascript/dashboard/i18n/locale/ja/components.json
index 516a6090d..75ea91312 100644
--- a/app/javascript/dashboard/i18n/locale/ja/components.json
+++ b/app/javascript/dashboard/i18n/locale/ja/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "詳細を見る",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 638e89405..5f3ce3a8e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "アカウントID",
         "NOTE": "APIベースの統合を構築する場合に必要なIDです"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "アカウント名",
         "PLACEHOLDER": "あなたのアカウント名",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "会社のサポートメールアドレス",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "アクティビティがない場合にチケットを自動解決するまでの日数",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "有効な自動解決期間を入力してください（最小1日、最大999日）"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "更新",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "あなたのアカウントでは、メールでの会話が継続可能です。",
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index d346e6354..ca786140f 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "メッセージが更新されました",
             "WEBWIDGET_TRIGGERED": "ユーザーによってライブチャットウィジェットが開かれました",
             "CONTACT_CREATED": "連絡先が作成されました",
-            "CONTACT_UPDATED": "連絡先が更新されました"
+            "CONTACT_UPDATED": "連絡先が更新されました",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/components.json b/app/javascript/dashboard/i18n/locale/ka/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/ka/components.json
+++ b/app/javascript/dashboard/i18n/locale/ka/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrations.json b/app/javascript/dashboard/i18n/locale/ka/integrations.json
index 5300c9239..e57ecb7cd 100644
--- a/app/javascript/dashboard/i18n/locale/ka/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ka/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/components.json b/app/javascript/dashboard/i18n/locale/ko/components.json
index b258479e5..fa25dece7 100644
--- a/app/javascript/dashboard/i18n/locale/ko/components.json
+++ b/app/javascript/dashboard/i18n/locale/ko/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 8355f3bc3..f5a58fbe1 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "계정 이름",
         "PLACEHOLDER": "당신의 계정 이름",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "회사 지원 이메일",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "활동이 없는 경우 티켓이 자동으로 해결되는 일 수",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "업데이트",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "계정에 대해 이메일을 통한 대화 연속성이 활성화되었습니다.",
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index 57efa4fc8..9d08df7df 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/components.json b/app/javascript/dashboard/i18n/locale/lt/components.json
index afa22a1f7..47b7bc6f5 100644
--- a/app/javascript/dashboard/i18n/locale/lt/components.json
+++ b/app/javascript/dashboard/i18n/locale/lt/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Sužinoti daugiau",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index 5a3187665..21729fe24 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Paskyros ID",
         "NOTE": "Šis ID reikalingas, jei kuriate API pagrįstą integraciją"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Paskyros vardas",
         "PLACEHOLDER": "Tavo paskyros vardas",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Jūsų įmonės pagalbos el. paštas",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Dienų skaičius, po kurio bilietas turi būti automatiškai uždarytas, jei nėra jokios veiklos",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Įveskite tinkamą automatinio išsprendimo trukmę (mažiausiai 1 diena ir daugiausia 999 dienos)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Atnaujinti",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Jūsų paskyroje leistas pokalbių tęstinumas su el. laiškais.",
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index 60bd7755a..7584aad45 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Pranešimas atnaujintas",
             "WEBWIDGET_TRIGGERED": "Tiesioginio pokalbio valdiklis, kurį atidarė vartotojas",
             "CONTACT_CREATED": "Sukurtas kontaktas",
-            "CONTACT_UPDATED": "Kontaktas atnaujintas"
+            "CONTACT_UPDATED": "Kontaktas atnaujintas",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/components.json b/app/javascript/dashboard/i18n/locale/lv/components.json
index 7a46b278c..33f36c584 100644
--- a/app/javascript/dashboard/i18n/locale/lv/components.json
+++ b/app/javascript/dashboard/i18n/locale/lv/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Uzzināt vairāk",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index 0edaa876f..c2f433163 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Konta ID",
         "NOTE": "Šis ID ir nepieciešams, ja veidojat uz API balstītu integrāciju"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Konta nosaukums",
         "PLACEHOLDER": "Jūsu konta nosaukums",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Jūsu uzņēmuma atbalsta e-pasts",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Dienu skaits pēc kā biļetei ir automātiski jāatrisinās, ja nenotiek nekādas darbības",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Lūdzu, ievadiet derīgu automātiskās atrisināšanas ilgumu (vismaz 1 diena un ne vairāk kā 999 dienas)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Atjaunināt",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Jūsu kontam ir iespējota sarunu nepārtrauktība ar e-pastiem.",
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
index a9ae45efe..31e21313f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Ziņojums atjaunināts",
             "WEBWIDGET_TRIGGERED": "Lietotājs atvēra tiešsaistes tērzēšanas logrīku",
             "CONTACT_CREATED": "Kontaktpersona izveidota",
-            "CONTACT_UPDATED": "Kontaktpersona atjaunināta"
+            "CONTACT_UPDATED": "Kontaktpersona atjaunināta",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/components.json b/app/javascript/dashboard/i18n/locale/ml/components.json
index f810c1e56..c2d1dc756 100644
--- a/app/javascript/dashboard/i18n/locale/ml/components.json
+++ b/app/javascript/dashboard/i18n/locale/ml/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index 92ca11725..e2769cbf0 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "അക്കൗണ്ടിന്റെ പേര്",
         "PLACEHOLDER": "നിങ്ങളുടെ അക്കൗണ്ടിന്റെ പേര്",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "നിങ്ങളുടെ കമ്പനിയുടെ പിന്തുണാ ഇമെയിൽ",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "പ്രവർത്തനമൊന്നുമില്ലെങ്കിൽ ടിക്കറ്റിന് ശേഷമുള്ള ദിവസങ്ങളുടെ എണ്ണം യാന്ത്രികമായി പരിഹരിക്കേണ്ടതാണ്",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "അപ്‌ഡേറ്റ്",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "നിങ്ങളുടെ അക്കൗണ്ടിനായി ഇമെയിലുകളുമായുള്ള സംഭാഷണ തുടർച്ച പ്രവർത്തനക്ഷമമാക്കി.",
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index 239803cd5..8be42ade5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/components.json b/app/javascript/dashboard/i18n/locale/ms/components.json
index 6aa91cf7f..c0ad88921 100644
--- a/app/javascript/dashboard/i18n/locale/ms/components.json
+++ b/app/javascript/dashboard/i18n/locale/ms/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
index 993cc338b..6a36c3ee5 100644
--- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ms/integrations.json b/app/javascript/dashboard/i18n/locale/ms/integrations.json
index 6d2b90acf..09770398e 100644
--- a/app/javascript/dashboard/i18n/locale/ms/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ms/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/components.json b/app/javascript/dashboard/i18n/locale/ne/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/ne/components.json
+++ b/app/javascript/dashboard/i18n/locale/ne/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index dd959dc09..c18a22039 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/components.json b/app/javascript/dashboard/i18n/locale/nl/components.json
index 15f2825a7..5f52637d7 100644
--- a/app/javascript/dashboard/i18n/locale/nl/components.json
+++ b/app/javascript/dashboard/i18n/locale/nl/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 465fc8a8c..6c1c86cc0 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "accountnaam",
         "PLACEHOLDER": "Uw accountnaam",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "E-mailadres support van uw bedrijf",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Vernieuwen",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index b80ce0712..8b5acabef 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Bericht bijgewerkt",
             "WEBWIDGET_TRIGGERED": "Live chat widget geopend door de gebruiker",
             "CONTACT_CREATED": "Contact aangemaakt",
-            "CONTACT_UPDATED": "Contact aangemaakt"
+            "CONTACT_UPDATED": "Contact aangemaakt",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/no/components.json b/app/javascript/dashboard/i18n/locale/no/components.json
index 2ec8d7dae..2e9776e1f 100644
--- a/app/javascript/dashboard/i18n/locale/no/components.json
+++ b/app/javascript/dashboard/i18n/locale/no/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index fa164f7c5..8cb2dc0b8 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Kontonavn",
         "PLACEHOLDER": "Ditt kontonavn",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Ditt firmas support e-post",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Antall dager en sak skal løses automatisk hvis det ikke har vært aktivitet",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Oppdater",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Samtalekontinuitet med e-post er aktivert for din konto.",
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index 0d0a80e97..37730dee2 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/components.json b/app/javascript/dashboard/i18n/locale/pl/components.json
index 2cf9539b1..dc56b980b 100644
--- a/app/javascript/dashboard/i18n/locale/pl/components.json
+++ b/app/javascript/dashboard/i18n/locale/pl/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Dowiedz się więcej",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index d1c9bb3c2..32f7df3ce 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID konta",
         "NOTE": "To ID jest wymagane, jeśli tworzysz integrację opartą na API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nazwa konta",
         "PLACEHOLDER": "Nazwa konta",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "E-mail obsługi klienta Twojej firmy",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Liczba dni po upływie których rozmowa powinna zostać automatycznie zamknięta z powodu braku aktywności",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Wprowadź poprawną wartość dla czasu automatycznego zamykania rozmów (minimum 1 dzień, maksimum 999 dni)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Aktualizuj",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Kontynuacja rozmów za pomocą wiadomości e-mail jest włączona dla Twojego konta.",
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index 7edd5db6e..17a431edb 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Aktualizacja wiadomości",
             "WEBWIDGET_TRIGGERED": "Użytkownik otworzył czat na żywo",
             "CONTACT_CREATED": "Utworzenie kontaktu",
-            "CONTACT_UPDATED": "Aktualizacja kontaktu"
+            "CONTACT_UPDATED": "Aktualizacja kontaktu",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/components.json b/app/javascript/dashboard/i18n/locale/pt/components.json
index cd5b970a3..df71ba7e8 100644
--- a/app/javascript/dashboard/i18n/locale/pt/components.json
+++ b/app/javascript/dashboard/i18n/locale/pt/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Saber mais",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 61a09f0f9..f7a221921 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID da conta",
         "NOTE": "Este ID é necessário para integrações via API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nome da conta",
         "PLACEHOLDER": "Nome da sua conta",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "E-mail de suporte da sua empresa",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Número de dias sem nenhuma atividade, após os quais o ticket se auto-resolve",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor, indique um período de resolução automática válido (mínimo de 1 dia e máximo de 999 dias)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Atualização",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A sua conta tem a opção de continuar as conversas por e-mail ativa.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index eabf9e01d..7ac8b957d 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Mensagem atualizada",
             "WEBWIDGET_TRIGGERED": "Widget de live-chat aberto pelo utilizador",
             "CONTACT_CREATED": "Contacto criado",
-            "CONTACT_UPDATED": "Contacto atualizado"
+            "CONTACT_UPDATED": "Contacto atualizado",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
index 1a48cedde..7958f4c14 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
@@ -45,7 +45,7 @@
       "FALSE": "Falso"
     },
     "ATTRIBUTES": {
-      "STATUS": "Situação",
+      "STATUS": "Status",
       "ASSIGNEE_NAME": "Agente atribuído",
       "INBOX_NAME": "Caixa de Entrada",
       "TEAM_NAME": "Nome do Time",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
index d6289dfb9..87c112cec 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
@@ -15,7 +15,7 @@
       "DESC": "Você pode adicionar e/ou remover agentes de um time.",
       "NAME": "Nome",
       "EMAIL": "E-mail",
-      "STATUS": "Situação",
+      "STATUS": "Status",
       "ACTIONS": "Ações",
       "VERIFIED": "Verificado",
       "VERIFICATION_PENDING": "Verificação Pendente",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
index c133acf78..5b3af42a7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
@@ -156,7 +156,7 @@
       "INBOX": "Caixa de Entrada",
       "CONVERSATION_LANGUAGE": "Idioma da conversa",
       "PHONE_NUMBER": "Número de Telefone",
-      "STATUS": "Situação",
+      "STATUS": "Status",
       "BROWSER_LANGUAGE": "Idioma do navegador",
       "MAIL_SUBJECT": "Assunto do e-mail",
       "COUNTRY_NAME": "País/região",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
index 431eaafe7..d60cc1c06 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
@@ -39,7 +39,7 @@
     "VIEW_FILTER": "Visualizar",
     "SORT_TOOLTIP_LABEL": "Ordenar conversas",
     "CHAT_SORT": {
-      "STATUS": "Situação",
+      "STATUS": "Status",
       "ORDER_BY": "Ordenar por"
     },
     "CHAT_TIME_STAMP": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/components.json b/app/javascript/dashboard/i18n/locale/pt_BR/components.json
index bf3330bac..e877c4f24 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/components.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Saiba mais",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutos",
+    "HOURS": "Horas",
+    "DAYS": "Dias",
+    "PLACEHOLDER": "Insira a duração"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 672e9a0dd..0a840b88a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -283,7 +283,7 @@
   },
   "CONTACTS_LAYOUT": {
     "HEADER": {
-      "TITLE": "Contato",
+      "TITLE": "Contatos",
       "SEARCH_TITLE": "Pesquisar contatos",
       "SEARCH_PLACEHOLDER": "Pesquisar...",
       "MESSAGE_BUTTON": "Enviar Mensagem",
@@ -291,7 +291,7 @@
       "BLOCK_CONTACT": "Bloquear contato",
       "UNBLOCK_CONTACT": "Desbloquear contato",
       "BREADCRUMB": {
-        "CONTACTS": "Contato"
+        "CONTACTS": "Contatos"
       },
       "ACTIONS": {
         "CONTACT_CREATION": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 32e9c436a..42e754522 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -201,12 +201,12 @@
     },
     "VISIBLE_TO_AGENTS": "Mensagem Privada: Apenas visível para você e seu time",
     "CHANGE_STATUS": "Estado da conversa mudou",
-    "CHANGE_STATUS_FAILED": "Mudança de situação da conversa falhou",
+    "CHANGE_STATUS_FAILED": "Mudança de status da conversa falhou",
     "CHANGE_AGENT": "Novo agente atribuído",
     "CHANGE_AGENT_FAILED": "Falha ao atribuir outro agente",
     "ASSIGN_LABEL_SUCCESFUL": "Etiqueta atribuída com sucesso",
     "ASSIGN_LABEL_FAILED": "Falha ao atribuir etiqueta",
-    "CHANGE_TEAM": "Situação da conversa mudou",
+    "CHANGE_TEAM": "Status da conversa mudou",
     "FILE_SIZE_LIMIT": "O arquivo excede os {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB do limite para anexos",
     "MESSAGE_ERROR": "Não foi possível enviar esta mensagem, por favor, tente novamente mais tarde",
     "SENT_BY": "Enviado por:",
@@ -234,7 +234,7 @@
       }
     },
     "SIDEBAR": {
-      "CONTACT": "Contato",
+      "CONTACT": "Contatos",
       "COPILOT": "Copiloto"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 785612ab3..8a567595b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID da Conta",
         "NOTE": "Este ID é necessário se você está construindo uma integração baseada em API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Resolver conversas automaticamente",
+        "NOTE": "Essa configuração permite resolver automaticamente a conversa após um determinado período. Defina a duração e personalize a mensagem para o usuário abaixo."
+      },
       "NAME": {
         "LABEL": "Nome da Conta",
         "PLACEHOLDER": "Nome da sua conta",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "E-mail de suporte da sua empresa",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Excluir conversas não atendidas",
+        "HELP": "Se ativado, o sistema não resolverá conversas que estiverem aguardando a resposta de um atendente."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Depois de quantos dias um ticket deve se resolver mesmo caso não haja nenhuma atividade",
+        "LABEL": "Tempo de inatividade para resolução",
+        "HELP": "Duração após a qual a conversa deve ser encerrada automaticamente em caso de inatividade",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor, insira um período de resolução automática válido (mínimo de 1 dia e máximo de 999 dias)"
+        "ERROR": "A duração para encerramento automático deve estar entre 10 minutos e 999 dias",
+        "API": {
+          "SUCCESS": "Configurações de resolução automática atualizadas com sucesso",
+          "ERROR": "Falha ao atualizar as configurações de resolução automática"
+        },
+        "UPDATE_BUTTON": "Atualizar",
+        "MESSAGE_LABEL": "Mensagem de resolução personalizada",
+        "MESSAGE_PLACEHOLDER": "A conversa foi marcada como resolvida pelo sistema por ter 15 dias de inatividade",
+        "MESSAGE_HELP": "Esta mensagem é enviada ao cliente quando uma conversa é resolvida automaticamente pelo sistema devido à inatividade."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A continuidade das conversas com e-mails está ativada para sua conta.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
index d9bb5aa32..9c7ec6a14 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
@@ -320,7 +320,7 @@
         "TITLE": "Título",
         "CATEGORY": "Categoria",
         "READ_COUNT": "Visualizações",
-        "STATUS": "Situação",
+        "STATUS": "Status",
         "LAST_EDITED": "Última edição"
       },
       "COLUMNS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 87e835285..0cb18819c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Mensagem atualizada",
             "WEBWIDGET_TRIGGERED": "Widget de chat aberto pelo usuário",
             "CONTACT_CREATED": "Contato criado",
-            "CONTACT_UPDATED": "Contato atualizado"
+            "CONTACT_UPDATED": "Contato atualizado",
+            "CONVERSATION_TYPING_ON": "Status de Digitação ativado",
+            "CONVERSATION_TYPING_OFF": "Status de Digitação desativado"
           }
         },
         "END_POINT": {
@@ -287,7 +289,7 @@
             "SEARCH": "Pesquisar etiqueta"
           },
           "STATUS": {
-            "LABEL": "Situação",
+            "LABEL": "Status",
             "PLACEHOLDER": "Selecione Status",
             "SEARCH": "Pesquisar status"
           },
@@ -305,7 +307,7 @@
         "LOADING_TEAM_ENTITIES_ERROR": "Houve um erro ao buscar as entidades do time, por favor, tente novamente"
       },
       "ISSUE": {
-        "STATUS": "Situação",
+        "STATUS": "Status",
         "PRIORITY": "Prioridade",
         "ASSIGNEE": "Responsável",
         "LABELS": "Etiquetas",
@@ -407,12 +409,12 @@
         "NAME": {
           "LABEL": "Nome",
           "PLACEHOLDER": "Digite o nome do assistente",
-          "ERROR": "The name is required"
+          "ERROR": "O nome é obrigatório"
         },
         "DESCRIPTION": {
           "LABEL": "Descrição",
           "PLACEHOLDER": "Digite a descrição do assistente",
-          "ERROR": "The description is required"
+          "ERROR": "A descrição é obrigatória"
         },
         "PRODUCT_NAME": {
           "LABEL": "Nome do Produto",
@@ -539,7 +541,7 @@
         "ALL_ASSISTANTS": "Todos"
       },
       "STATUS": {
-        "TITLE": "Situação",
+        "TITLE": "Status",
         "PENDING": "Pendentes",
         "APPROVED": "Aceito",
         "ALL": "Todos"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index 1565b76ea..cdad1b31f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -474,7 +474,7 @@
         "AGENT": "Agente",
         "OPEN": "Abrir",
         "UNATTENDED": "Não atendidas",
-        "STATUS": "Situação"
+        "STATUS": "Status"
       }
     },
     "TEAM_CONVERSATIONS": {
@@ -486,11 +486,11 @@
         "TEAM": "Time",
         "OPEN": "Abrir",
         "UNATTENDED": "Não atendidas",
-        "STATUS": "Situação"
+        "STATUS": "Status"
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "Situação do agente",
+      "HEADER": "Status do agente",
       "ONLINE": "Disponível",
       "BUSY": "Ocupado",
       "OFFLINE": "Desconectado"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 7171217a8..fe275b6b9 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -279,7 +279,7 @@
     "UNATTENDED_CONVERSATIONS": "Não atendidas",
     "REPORTS": "Relatórios",
     "SETTINGS": "Configurações",
-    "CONTACTS": "Contato",
+    "CONTACTS": "Contatos",
     "CAPTAIN": "Capitão",
     "CAPTAIN_ASSISTANTS": "Assistentes",
     "CAPTAIN_DOCUMENTS": "Documentos",
diff --git a/app/javascript/dashboard/i18n/locale/ro/components.json b/app/javascript/dashboard/i18n/locale/ro/components.json
index 03d4a2391..5be9ed8ab 100644
--- a/app/javascript/dashboard/i18n/locale/ro/components.json
+++ b/app/javascript/dashboard/i18n/locale/ro/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Află mai mult",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index b9badadd9..f8b245cd1 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID cont",
         "NOTE": "Acest ID este necesar dacă construiți o integrare bazată pe API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Nume cont",
         "PLACEHOLDER": "Numele contului tău",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "E-mailul de asistență al companiei dumneavoastră",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Numărul de zile de pe bilet ar trebui să se rezolve automat dacă nu există activitate",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Vă rugăm să introduceți o durată validă de rezolvare automată (minim 1 zi și maximum 999 de zile)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Actualizare",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuitatea conversației cu e-mailurile este activată pentru contul dvs.",
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index 38340d476..c2575ec94 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Mesaj actualizat",
             "WEBWIDGET_TRIGGERED": "Widget de chat live deschis de utilizator",
             "CONTACT_CREATED": "Persoană de contact creată",
-            "CONTACT_UPDATED": "Persoană de contact actualizată"
+            "CONTACT_UPDATED": "Persoană de contact actualizată",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/components.json b/app/javascript/dashboard/i18n/locale/ru/components.json
index 3e3cb1aad..92890e3e0 100644
--- a/app/javascript/dashboard/i18n/locale/ru/components.json
+++ b/app/javascript/dashboard/i18n/locale/ru/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Узнайте больше",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index d8f0610d8..38ec9c2ce 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID аккаунта",
         "NOTE": "Этот ID требуется для построения интеграции, основанной на API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Имя аккаунта",
         "PLACEHOLDER": "Имя вашего аккаунта",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Email службы поддержки вашей компании",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Количество дней после того, как тикет будет автоматически решен, если нет активности",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Введите корректную длительность для автозавершения диалога (минимум 1 день, максимум 999)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Обновить",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Для вашего аккаунта включено продолжение диалогов по электронной почте.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index cf4a3286a..13c54d302 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Сообщение обновлено",
             "WEBWIDGET_TRIGGERED": "Виджет онлайн чата, открыт пользователем",
             "CONTACT_CREATED": "Контакт создан",
-            "CONTACT_UPDATED": "Контакт обновлен"
+            "CONTACT_UPDATED": "Контакт обновлен",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/components.json b/app/javascript/dashboard/i18n/locale/sh/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/sh/components.json
+++ b/app/javascript/dashboard/i18n/locale/sh/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/sh/integrations.json b/app/javascript/dashboard/i18n/locale/sh/integrations.json
index 5300c9239..e57ecb7cd 100644
--- a/app/javascript/dashboard/i18n/locale/sh/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sh/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/components.json b/app/javascript/dashboard/i18n/locale/sk/components.json
index c03937260..8c705e06d 100644
--- a/app/javascript/dashboard/i18n/locale/sk/components.json
+++ b/app/javascript/dashboard/i18n/locale/sk/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index c598577c5..f0cc9e8ac 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID účtu",
         "NOTE": "Toto ID je potrebné, ak vytvárate integráciu založenú na rozhraní API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Názov účtu",
         "PLACEHOLDER": "Názov vášho účtu",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "E-mailová podpora vašej spoločnosti",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Počet dní po automatickom vyriešení tiketu, ak sa nevykonáva žiadna aktivita",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Pre vaše konto je povolená kontinuita konverzácie s e-mailami.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index d04a971ff..d22a60294 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/sl/components.json b/app/javascript/dashboard/i18n/locale/sl/components.json
index d4707b1eb..52d6109e1 100644
--- a/app/javascript/dashboard/i18n/locale/sl/components.json
+++ b/app/javascript/dashboard/i18n/locale/sl/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/sl/integrations.json b/app/javascript/dashboard/i18n/locale/sl/integrations.json
index d225f442e..dcfca6e9e 100644
--- a/app/javascript/dashboard/i18n/locale/sl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sl/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/sq/components.json b/app/javascript/dashboard/i18n/locale/sq/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/sq/components.json
+++ b/app/javascript/dashboard/i18n/locale/sq/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/sq/integrations.json b/app/javascript/dashboard/i18n/locale/sq/integrations.json
index 36826d0db..d3a7f8c8d 100644
--- a/app/javascript/dashboard/i18n/locale/sq/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sq/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/components.json b/app/javascript/dashboard/i18n/locale/sr/components.json
index 42a86f093..f78a78497 100644
--- a/app/javascript/dashboard/i18n/locale/sr/components.json
+++ b/app/javascript/dashboard/i18n/locale/sr/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Saznajte više",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index 4ab3baaf8..f808851d8 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID naloga",
         "NOTE": "Ovaj ID je neophodan ako izgrađujete integraciju zasnovanu na API-ju"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Naziv naloga",
         "PLACEHOLDER": "Naziv vašeg naloga",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "E-pošta podrške vaše kompanije",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Broj dana nakon čega će se tiket automatski rešiti ako nema aktivnosti",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Molim vas unesite ispravno trajanje za automatsko rešavanje (minimalno 1 dan i maksimalno 999 dana)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Primeni",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Nastavljanje razgovora putem e-poruka je omogućeno za vaš nalog.",
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index 8af9a3b60..1db35cc89 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Poruka je izmenjena",
             "WEBWIDGET_TRIGGERED": "Vidžet za ćaskanje je otvoren od strane korisnika",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/components.json b/app/javascript/dashboard/i18n/locale/sv/components.json
index fe14f7b45..bd0548eed 100644
--- a/app/javascript/dashboard/i18n/locale/sv/components.json
+++ b/app/javascript/dashboard/i18n/locale/sv/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Läs mer",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index f0bb3a031..e4f72bf9a 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Kontonamn",
         "PLACEHOLDER": "Ditt kontonamn",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Ditt företags supportmejl",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Antal dagar till ett ärende ska automatlösas på grund av inaktivitet",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Uppdatera",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Konversationskontinuitet med e-post är aktiverat för ditt konto.",
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index 8fd861823..5942f99a4 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/components.json b/app/javascript/dashboard/i18n/locale/ta/components.json
index 59a7ddec1..4adf87ecf 100644
--- a/app/javascript/dashboard/i18n/locale/ta/components.json
+++ b/app/javascript/dashboard/i18n/locale/ta/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 806674316..f1e16d2e2 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "கணக்கின் பெயர்",
         "PLACEHOLDER": "உங்கள் கணக்கின் பெயர்",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "உங்கள் நிறுவனத்தின் சேவைக்கான ஈ-மெயில் முகவரி",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "புதுப்பிப்பு",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index 10643fec2..9626e0fb0 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/th/components.json b/app/javascript/dashboard/i18n/locale/th/components.json
index f20c1e3fd..93cf557c3 100644
--- a/app/javascript/dashboard/i18n/locale/th/components.json
+++ b/app/javascript/dashboard/i18n/locale/th/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "เรียนรู้เพิ่มเติม",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 677d5633f..7e09ea6a2 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "หมายเลขบัญชี",
         "NOTE": "โปรดระบุหมายเลขบัญชีหากคุณต้องการเชื่อมต่อกับ API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "ชื่อบัญชี",
         "PLACEHOLDER": "ชื่อบัญชีของคุณ",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "อีเมล์ช่วยเหลือในบริษัทของคุณ",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "จำนวนวันที่จะเปลี่ยนสถานะเป็นสำเร็จถ้าไม่มีความเคลื่อนไหว",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "โปรดระบุช่วงเวลาในการปิดการสนทนาอัตโนมัติให้ถูกต้อง (ขั้นต่ำ 1 วัน มากสุด 999 วัน)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "อัพเดท",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "การสนทนาด้วยอีเมล์ถูกเปิดสำหรับบัญชีของคุณ",
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index a1d92a1a4..7fb20eb52 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "อัปเดตข้อความแล้ว",
             "WEBWIDGET_TRIGGERED": "Live chat widget ถูกเปิดโดยผู้ใช้งาน",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/tl/components.json b/app/javascript/dashboard/i18n/locale/tl/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/tl/components.json
+++ b/app/javascript/dashboard/i18n/locale/tl/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tl/generalSettings.json b/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/tl/integrations.json b/app/javascript/dashboard/i18n/locale/tl/integrations.json
index f1a1d42c2..0e3c46b97 100644
--- a/app/javascript/dashboard/i18n/locale/tl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tl/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/components.json b/app/javascript/dashboard/i18n/locale/tr/components.json
index a6611ad40..c047c1c85 100644
--- a/app/javascript/dashboard/i18n/locale/tr/components.json
+++ b/app/javascript/dashboard/i18n/locale/tr/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Daha Fazla",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index 1a7be9302..a000921de 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Hesap Kimliği",
         "NOTE": "API tabanlı bir entegrasyon oluşturuyorsanız bu kimlik gereklidir"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Hesap Adı",
         "PLACEHOLDER": "Hesap adınız",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Şirketinizin destek e-postası",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Etkinlik yoksa, bir biletin otomatik olarak çözülmesi gereken gün sayısı",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Lütfen geçerli bir otomatik çözüm süresi girin (minimum 1 gün ve maksimum 999 gün)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Güncelleme",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Hesabınız için e-posta ile iletişim devre dışı bırakıldı.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index 9d18d873d..d2e0426a9 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Mesaj Güncellendi",
             "WEBWIDGET_TRIGGERED": "Kullanıcı tarafından canlı sohbet widget'ı açıldı",
             "CONTACT_CREATED": "Kişi Oluşturuldu",
-            "CONTACT_UPDATED": "Kişi Güncellendi"
+            "CONTACT_UPDATED": "Kişi Güncellendi",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/components.json b/app/javascript/dashboard/i18n/locale/uk/components.json
index aab333184..22395ecc6 100644
--- a/app/javascript/dashboard/i18n/locale/uk/components.json
+++ b/app/javascript/dashboard/i18n/locale/uk/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Детальніше",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index ae8bc398d..1e166b3d0 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "ID акаунту",
         "NOTE": "Цей ID необхідний, якщо ви створюєте інтеграцію з API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Назва облікового запису",
         "PLACEHOLDER": "Ім'я вашого облікового запису",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Email підтримки вашої компанії",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Кількість днів після того, як заявка повинна автоматично буде закрита, якщо немає активності",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Будь ласка, введіть допустиму тривалість автозакртиття (мінімум 1 день і максимум 999 днів)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Оновити",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Продовження діалогу з е-поштою активоване для вашого облікового запису.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index 0da64bbaa..a13516cd8 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Повідомлення оновлено",
             "WEBWIDGET_TRIGGERED": "Віджет онлайн чату відкрий користувачем",
             "CONTACT_CREATED": "Контакт створено",
-            "CONTACT_UPDATED": "Контакт оновлено"
+            "CONTACT_UPDATED": "Контакт оновлено",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/components.json b/app/javascript/dashboard/i18n/locale/ur/components.json
index 081b19bb3..02df3a635 100644
--- a/app/javascript/dashboard/i18n/locale/ur/components.json
+++ b/app/javascript/dashboard/i18n/locale/ur/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index 16864e8a1..e0bee9f65 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
index 914adced3..6e3f11061 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/components.json b/app/javascript/dashboard/i18n/locale/ur_IN/components.json
index c7230b1fc..e44c6e039 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/components.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
index cfda6c7da..7da76df18 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Account name",
         "PLACEHOLDER": "Your account name",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Update",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
index 5300c9239..e57ecb7cd 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/components.json b/app/javascript/dashboard/i18n/locale/vi/components.json
index cb1ea956b..d7fdcc472 100644
--- a/app/javascript/dashboard/i18n/locale/vi/components.json
+++ b/app/javascript/dashboard/i18n/locale/vi/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Tìm hiểu thêm",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index e7ec0d341..14332c848 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Tài khoản SID",
         "NOTE": "ID này là bắt buộc nếu bạn đang xây dựng tích hợp dựa trên API"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "Tên tài khoản",
         "PLACEHOLDER": "Tên tài khoản của bạn",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "Email hỗ trợ của công ty bạn",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Số ngày sau đó mà vé sẽ tự động giải quyết nếu không có hoạt động nào",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Vui lòng điền thời lượng tự động giải quyết hợp lệ (tối thiểu 1 ngày và tối đa 999 ngày)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "Cập nhật",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Tính liên tục của cuộc trò chuyện với email được kích hoạt cho tài khoản của bạn.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index 8cdd6c425..6d50f75dc 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Tin nhắn đã được cập nhật",
             "WEBWIDGET_TRIGGERED": "Tiện ích trò chuyện trực tuyến do người dùng mở",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/components.json b/app/javascript/dashboard/i18n/locale/zh_CN/components.json
index 72dc74dfa..8be474f93 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/components.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "了解更多",
     "WATCH_VIDEO": "观看视频"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 2e3ecafaf..a0545add4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "账号 ID",
         "NOTE": "如果您正在构建基于 API 的集成，那么此 ID 是必需的"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "帐户名称",
         "PLACEHOLDER": "您的帐户名称",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "您公司的支持邮件",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "非活跃工单的自动结单的天数",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "请输入一个有效的自动解决时间 (至少 1 天，最多999 天)。"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "更新",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帐户启用了与电子邮件的对话连续性。",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index 1c13783c8..406e17ead 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "消息已更新",
             "WEBWIDGET_TRIGGERED": "用户打开实时聊天小部件",
             "CONTACT_CREATED": "联系人已创建",
-            "CONTACT_UPDATED": "联系人已更新"
+            "CONTACT_UPDATED": "联系人已更新",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/components.json b/app/javascript/dashboard/i18n/locale/zh_TW/components.json
index 8631ab450..9d4176c48 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/components.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/components.json
@@ -43,5 +43,11 @@
   "FEATURE_SPOTLIGHT": {
     "LEARN_MORE": "Learn more",
     "WATCH_VIDEO": "Watch video"
+  },
+  "DURATION_INPUT": {
+    "MINUTES": "Minutes",
+    "HOURS": "Hours",
+    "DAYS": "Days",
+    "PLACEHOLDER": "Enter duration"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index fcb2fc026..af49409ef 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -44,6 +44,10 @@
         "TITLE": "Account ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
+      "AUTO_RESOLVE": {
+        "TITLE": "Auto-resolve conversations",
+        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period. Set the duration and customize the message to the user below."
+      },
       "NAME": {
         "LABEL": "帳戶名稱",
         "PLACEHOLDER": "您的帳戶名稱",
@@ -64,10 +68,23 @@
         "PLACEHOLDER": "您公司的客服信箱",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_IGNORE_WAITING": {
+        "LABEL": "Exclude unattended conversations",
+        "HELP": "When enabled, the system will skip resolving conversations that are still waiting for an agent’s reply."
+      },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Inactivity duration for resolution",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "API": {
+          "SUCCESS": "Auto resolve settings updated successfully",
+          "ERROR": "Failed to update auto resolve settings"
+        },
+        "UPDATE_BUTTON": "更新",
+        "MESSAGE_LABEL": "Custom resolution message",
+        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帳戶啟用了電子信箱與對話的持續性功能。",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index 758fbe8ce..71f96f4a2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -41,7 +41,9 @@
             "MESSAGE_UPDATED": "Message updated",
             "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
             "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_UPDATED": "Contact updated",
+            "CONVERSATION_TYPING_ON": "Conversation Typing On",
+            "CONVERSATION_TYPING_OFF": "Conversation Typing Off"
           }
         },
         "END_POINT": {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index 073ef9a7a..5681cb0f9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -151,7 +151,7 @@ export default {
 <template>
   <div class="flex flex-col max-w-2xl mx-auto w-full">
     <BaseSettingsHeader :title="$t('GENERAL_SETTINGS.TITLE')" />
-    <div class="flex-grow flex-shrink min-w-0 mt-3 overflow-auto">
+    <div class="flex-grow flex-shrink min-w-0 mt-3">
       <SectionLayout
         :title="$t('GENERAL_SETTINGS.FORM.GENERAL_SECTION.TITLE')"
         :description="$t('GENERAL_SETTINGS.FORM.GENERAL_SECTION.NOTE')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue b/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue
index e3fb424ca..9816fc7e0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue
@@ -13,6 +13,7 @@ import NextButton from 'dashboard/components-next/button/Button.vue';
 const { t } = useI18n();
 const duration = ref(0);
 const message = ref('');
+const ignoreWaiting = ref(false);
 const isEnabled = ref(false);
 
 const { currentAccount, updateAccount } = useAccount();
@@ -20,11 +21,15 @@ const { currentAccount, updateAccount } = useAccount();
 watch(
   currentAccount,
   () => {
-    const { auto_resolve_after, auto_resolve_message } =
-      currentAccount.value?.settings || {};
+    const {
+      auto_resolve_after,
+      auto_resolve_message,
+      auto_resolve_ignore_waiting,
+    } = currentAccount.value?.settings || {};
 
     duration.value = auto_resolve_after;
     message.value = auto_resolve_message;
+    ignoreWaiting.value = auto_resolve_ignore_waiting;
 
     if (duration.value) {
       isEnabled.value = true;
@@ -43,9 +48,15 @@ const updateAccountSettings = async settings => {
 };
 
 const handleSubmit = async () => {
+  if (duration.value < 10) {
+    useAlert(t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.ERROR'));
+    return Promise.resolve();
+  }
+
   return updateAccountSettings({
     auto_resolve_after: duration.value,
     auto_resolve_message: message.value,
+    auto_resolve_ignore_waiting: ignoreWaiting.value,
   });
 };
 
@@ -56,6 +67,7 @@ const handleDisable = async () => {
   return updateAccountSettings({
     auto_resolve_after: null,
     auto_resolve_message: '',
+    auto_resolve_ignore_waiting: false,
   });
 };
 
@@ -76,7 +88,7 @@ const toggleAutoResolve = async () => {
       </div>
     </template>
 
-    <form class="grid gap-4" @submit.prevent="handleSubmit">
+    <form class="grid gap-5" @submit.prevent="handleSubmit">
       <WithLabel
         :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.LABEL')"
         :help-message="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.HELP')"
@@ -85,7 +97,7 @@ const toggleAutoResolve = async () => {
           <!-- allow 10 mins to 999 days -->
           <DurationInput
             v-model="duration"
-            min="10"
+            min="0"
             max="1439856"
             class="w-full"
           />
@@ -105,6 +117,16 @@ const toggleAutoResolve = async () => {
           "
         />
       </WithLabel>
+      <WithLabel
+        :label="t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_IGNORE_WAITING.LABEL')"
+      >
+        <template #rightOfLabel>
+          <Switch v-model="ignoreWaiting" />
+        </template>
+        <p class="text-sm ml-px text-n-slate-10 max-w-lg">
+          {{ t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_IGNORE_WAITING.HELP') }}
+        </p>
+      </WithLabel>
       <div class="flex gap-2">
         <NextButton
           blue
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/components/SectionLayout.vue b/app/javascript/dashboard/routes/dashboard/settings/account/components/SectionLayout.vue
index d1d29b1a7..5b203cd26 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/components/SectionLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/components/SectionLayout.vue
@@ -17,7 +17,7 @@ defineProps({
 
 <template>
   <section
-    class="grid grid-cols-1 py-8 gap-10"
+    class="grid grid-cols-1 py-8 gap-8"
     :class="{ 'border-t border-n-weak': withBorder }"
   >
     <header class="grid grid-cols-4">
@@ -25,7 +25,7 @@ defineProps({
         <h4 class="text-lg font-medium text-n-slate-12">
           <slot name="title">{{ title }}</slot>
         </h4>
-        <p class="text-n-slate-11">
+        <p class="text-n-slate-11 text-sm mt-2">
           <slot name="description">{{ description }}</slot>
         </p>
       </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
index f3c724bb2..430658329 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
@@ -16,6 +16,8 @@ const SUPPORTED_WEBHOOK_EVENTS = [
   'webwidget_triggered',
   'contact_created',
   'contact_updated',
+  'conversation_typing_on',
+  'conversation_typing_off',
 ];
 
 export default {
diff --git a/app/javascript/portal/components/TableOfContents.vue b/app/javascript/portal/components/TableOfContents.vue
index 16da81f71..ec7ccd895 100644
--- a/app/javascript/portal/components/TableOfContents.vue
+++ b/app/javascript/portal/components/TableOfContents.vue
@@ -94,8 +94,8 @@ export default {
 </script>
 
 <template>
-  <div class="hidden lg:block flex-1 py-6 scroll-mt-24 pl-4">
-    <div v-if="rows.length > 0" class="sticky top-24 py-2 overflow-auto">
+  <div class="hidden lg:block flex-1 py-6 scroll-mt-24 pl-4 sticky top-24">
+    <div v-if="rows.length > 0" class="py-2 overflow-auto">
       <nav class="max-w-2xl">
         <ol
           role="list"
diff --git a/app/javascript/v3/components/Form/WithLabel.vue b/app/javascript/v3/components/Form/WithLabel.vue
index 846071e6d..08e0b026b 100644
--- a/app/javascript/v3/components/Form/WithLabel.vue
+++ b/app/javascript/v3/components/Form/WithLabel.vue
@@ -34,13 +34,13 @@ defineProps({
       </div>
       <div
         v-if="errorMessage && hasError"
-        class="text-xs mt-2 ml-px text-n-ruby-9 leading-tight"
+        class="text-sm mt-1.5 ml-px text-n-ruby-9 leading-tight"
       >
         {{ errorMessage }}
       </div>
       <div
         v-else-if="helpMessage || $slots.help"
-        class="text-xs mt-2 ml-px text-n-slate-10 leading-tight"
+        class="text-sm mt-1.5 ml-px text-n-slate-10 leading-tight"
       >
         <slot name="help">
           {{ helpMessage }}
diff --git a/app/jobs/conversations/resolution_job.rb b/app/jobs/conversations/resolution_job.rb
index 1bfc1c2e0..37a9d834c 100644
--- a/app/jobs/conversations/resolution_job.rb
+++ b/app/jobs/conversations/resolution_job.rb
@@ -3,7 +3,7 @@ class Conversations::ResolutionJob < ApplicationJob
 
   def perform(account:)
     # limiting the number of conversations to be resolved to avoid any performance issues
-    resolvable_conversations = account.conversations.resolvable(account.auto_resolve_after).limit(Limits::BULK_ACTIONS_LIMIT)
+    resolvable_conversations = conversation_scope(account).limit(Limits::BULK_ACTIONS_LIMIT)
     resolvable_conversations.each do |conversation|
       # send message from bot that conversation has been resolved
       # do this is account.auto_resolve_message is set
@@ -11,4 +11,14 @@ class Conversations::ResolutionJob < ApplicationJob
       conversation.toggle_status
     end
   end
+
+  private
+
+  def conversation_scope(account)
+    if account.auto_resolve_ignore_waiting
+      account.conversations.resolvable_not_waiting(account.auto_resolve_after)
+    else
+      account.conversations.resolvable_all(account.auto_resolve_after)
+    end
+  end
 end
diff --git a/app/jobs/internal/process_stale_contacts_job.rb b/app/jobs/internal/process_stale_contacts_job.rb
index 4c9990415..28143cd6a 100644
--- a/app/jobs/internal/process_stale_contacts_job.rb
+++ b/app/jobs/internal/process_stale_contacts_job.rb
@@ -1,5 +1,5 @@
 # housekeeping
-# remove stale contacts for all accounts
+# remove stale contacts for subset of accounts each day
 # - have no identification (email, phone_number, and identifier are NULL)
 # - have no conversations
 # - are older than 30 days
@@ -7,14 +7,33 @@
 class Internal::ProcessStaleContactsJob < ApplicationJob
   queue_as :housekeeping
 
+  # Number of day-based groups to split accounts into
+  DISTRIBUTION_GROUPS = 5
+  # Max accounts to process in one batch
+  MAX_ACCOUNTS_PER_BATCH = 20
+
+  # Process only a subset of accounts per day to avoid flooding the queue
   def perform
     return unless ChatwootApp.chatwoot_cloud?
 
-    Account.find_in_batches(batch_size: 100) do |accounts|
-      accounts.each do |account|
-        Rails.logger.info "Enqueuing RemoveStaleContactsJob for account #{account.id}"
-        Internal::RemoveStaleContactsJob.perform_later(account)
-      end
+    # Use the day of the month to determine which accounts to process
+    day_of_month = Date.current.day
+    remainder = day_of_month % DISTRIBUTION_GROUPS
+
+    # Count total accounts for logging
+    total_accounts = Account.count
+    log_message = "ProcessStaleContactsJob: Processing accounts with ID % #{DISTRIBUTION_GROUPS} = "
+    log_message += "#{remainder} (out of #{total_accounts} total accounts)"
+    Rails.logger.info log_message
+
+    # Process only accounts where ID % 5 = remainder for today
+    # This ensures each account is processed approximately once every 5 days
+    Account.where("id % #{DISTRIBUTION_GROUPS} = ?", remainder).find_each(batch_size: MAX_ACCOUNTS_PER_BATCH) do |account|
+      Rails.logger.info "Enqueuing RemoveStaleContactsJob for account #{account.id}"
+
+      # Add a small delay between jobs to further reduce queue pressure
+      delay = rand(1..10).minutes
+      Internal::RemoveStaleContactsJob.set(wait: delay).perform_later(account)
     end
   end
 end
diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb
index 3fdd823b8..82a9fc711 100644
--- a/app/listeners/webhook_listener.rb
+++ b/app/listeners/webhook_listener.rb
@@ -83,8 +83,30 @@ class WebhookListener < BaseListener
     deliver_account_webhooks(payload, account)
   end
 
+  def conversation_typing_on(event)
+    handle_typing_status(__method__.to_s, event)
+  end
+
+  def conversation_typing_off(event)
+    handle_typing_status(__method__.to_s, event)
+  end
+
   private
 
+  def handle_typing_status(event_name, event)
+    conversation = event.data[:conversation]
+    user = event.data[:user]
+    inbox = conversation.inbox
+
+    payload = {
+      event: event_name,
+      user: user.webhook_data,
+      conversation: conversation.webhook_data,
+      is_private: event.data[:is_private] || false
+    }
+    deliver_webhook_payloads(payload, inbox)
+  end
+
   def deliver_account_webhooks(payload, account)
     account.webhooks.account_type.each do |webhook|
       next unless webhook.subscriptions.include?(payload[:event])
diff --git a/app/models/account.rb b/app/models/account.rb
index 762cd505f..1664ce29b 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -34,10 +34,11 @@ class Account < ApplicationRecord
     'properties':
       {
         'auto_resolve_after': { 'type': %w[integer null], 'minimum': 10, 'maximum': 1_439_856 },
-        'auto_resolve_message': { 'type': %w[string null] }
+        'auto_resolve_message': { 'type': %w[string null] },
+        'auto_resolve_ignore_waiting': { 'type': %w[boolean null] }
       },
     'required': [],
-    'additionalProperties': false
+    'additionalProperties': true
   }.to_json.freeze
 
   DEFAULT_QUERY_SETTING = {
@@ -50,7 +51,7 @@ class Account < ApplicationRecord
                  schema: SETTINGS_PARAMS_SCHEMA,
                  attribute_resolver: ->(record) { record.settings }
 
-  store_accessor :settings, :auto_resolve_after, :auto_resolve_message
+  store_accessor :settings, :auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting
 
   has_many :account_users, dependent: :destroy_async
   has_many :agent_bot_inboxes, dependent: :destroy_async
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 492c0cfb6..d7efff139 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -76,11 +76,16 @@ class Conversation < ApplicationRecord
   scope :assigned, -> { where.not(assignee_id: nil) }
   scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
   scope :unattended, -> { where(first_reply_created_at: nil).or(where.not(waiting_since: nil)) }
-  scope :resolvable, lambda { |auto_resolve_after|
+  scope :resolvable_not_waiting, lambda { |auto_resolve_after|
     return none if auto_resolve_after.to_i.zero?
 
     open.where('last_activity_at < ? AND waiting_since IS NULL', Time.now.utc - auto_resolve_after.minutes)
   }
+  scope :resolvable_all, lambda { |auto_resolve_after|
+    return none if auto_resolve_after.to_i.zero?
+
+    open.where('last_activity_at < ?', Time.now.utc - auto_resolve_after.minutes)
+  }
 
   scope :last_user_message_at, lambda {
     joins(
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index 540dbd9b7..105ffdc91 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -26,7 +26,8 @@ class Webhook < ApplicationRecord
   enum webhook_type: { account_type: 0, inbox_type: 1 }
 
   ALLOWED_WEBHOOK_EVENTS = %w[conversation_status_changed conversation_updated conversation_created contact_created contact_updated
-                              message_created message_updated webwidget_triggered inbox_created inbox_updated].freeze
+                              message_created message_updated webwidget_triggered inbox_created inbox_updated
+                              conversation_typing_on conversation_typing_off].freeze
 
   private
 
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index b61cb8a8b..fdbd47008 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -21,8 +21,9 @@ class Rack::Attack
     end
 
     def allowed_ip?
-      allowed_ips = ['127.0.0.1', '::1']
-      allowed_ips.include?(remote_ip)
+      default_allowed_ips = ['127.0.0.1', '::1']
+      env_allowed_ips = ENV.fetch('RACK_ATTACK_ALLOWED_IPS', '').split(',').map(&:strip)
+      (default_allowed_ips + env_allowed_ips).include?(remote_ip)
     end
 
     # Rails would allow requests to paths with extentions, so lets compare against the path with extention stripped
@@ -32,6 +33,15 @@ class Rack::Attack
     end
   end
 
+  ### Safelist IPs from Environment Variable ###
+  #
+  # This block ensures requests from any IP present in RACK_ATTACK_ALLOWED_IPS
+  # will bypass Rack::Attack’s throttling rules.
+  #
+  # Example: RACK_ATTACK_ALLOWED_IPS="127.0.0.1,::1,192.168.0.10"
+
+  Rack::Attack.safelist('trusted IPs', &:allowed_ip?)
+
   ### Throttle Spammy Clients ###
 
   # If any single client IP is making tons of requests, then they're
diff --git a/config/locales/am.yml b/config/locales/am.yml
index 289179ac7..1e06aebde 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -145,7 +145,9 @@ am:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9418da59e..1394d927c 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -145,7 +145,9 @@ ar:
         open: 'تم إعادة فتح المحادثة بواسطة %{user_name}'
         pending: 'تم تحديث حالة المحادثة لـ"معلقة" بواسطة %{user_name}'
         snoozed: 'تم تأجيل المحادثة بواسطة %{user_name}'
-        auto_resolved: 'تم وضع علامة على المحادثة كمحلولة من قبل النظام بسبب %{duration} أيام من عدم النشاط'
+        auto_resolved_days: 'تم وضع علامة على المحادثة كمحلولة من قبل النظام بسبب %{count} أيام من عدم النشاط'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: أعاد النظام فتح المحادثة بسبب رسالة واردة جديدة.
       priority:
         added: '%{user_name} حدد الأولوية إلى %{new_priority}'
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 2dbf3f936..2375edafb 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -145,7 +145,9 @@ az:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 02752863c..18fca0c3b 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -145,7 +145,9 @@ bg:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 67aa72fa9..25fdecfe1 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -145,7 +145,9 @@ ca:
         open: 'La conversa es va reobrir per %{user_name}'
         pending: 'La conversa va ser marcada com pendent per %{user_name}'
         snoozed: '%{user_name} ha posposat la conversa'
-        auto_resolved: 'El sistema ha marcat que la conversa s''ha resolt a causa de %{duration} dies d''inactivitat'
+        auto_resolved_days: 'El sistema ha marcat que la conversa s''ha resolt a causa de %{count} dies d''inactivitat'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: El sistema ha reobert la conversa a causa d'un nou missatge entrant.
       priority:
         added: '%{user_name} ha establert la prioritat a %{new_priority}'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 3b563c9f8..890aefe25 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -145,7 +145,9 @@ cs:
         open: 'Konverzace byla znovu otevřena uživatelem %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index ae82593cf..0b03be9f6 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -145,7 +145,9 @@ da:
         open: 'Samtalen blev genåbnet af %{user_name}'
         pending: 'Samtalen blev markeret som afventende af %{user_name}'
         snoozed: 'Samtalen blev udskudt af %{user_name}'
-        auto_resolved: 'Samtalen blev markeret som løst af systemet på grund af %{duration} dages inaktivitet'
+        auto_resolved_days: 'Samtalen blev markeret som løst af systemet på grund af %{count} dages inaktivitet'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9ed63cd17..584092e32 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -145,7 +145,9 @@ de:
         open: 'Das Gespräch wurde von %{user_name} wieder eröffnet'
         pending: 'Das Gespräch wurde von %{user_name} als ausstehend markiert'
         snoozed: 'Das Gespräch wurde von %{user_name} zur Erinnerung markiert'
-        auto_resolved: 'Das Gespräch wurde vom System aufgrund von %{duration} Tagen Inaktivität gelöst'
+        auto_resolved_days: 'Das Gespräch wurde vom System aufgrund von %{count} Tagen Inaktivität gelöst'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Das System hat die Unterhaltung aufgrund einer neuen eingehenden Nachricht wieder geöffnet.
       priority:
         added: '%{user_name} hat die Priorität auf %{new_priority} gesetzt'
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 7a1efc9b0..53e2828f5 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -145,7 +145,9 @@ el:
         open: 'Έγινε επαναφορά της συνομιλίας από τον %{user_name}'
         pending: 'Η συνομιλία επισημάνθηκε ως εκκρεμής από τον %{user_name}'
         snoozed: 'Η συνομιλία σημάνθηκε ως "καθυστερημένη" (snoozed) από τον %{user_name}'
-        auto_resolved: 'Η συνομιλία σημάνθηκε επιλυθείσα από το σύστημα με την παρέλευση %{duration} ημερών άνευ δραστηριότητας'
+        auto_resolved_days: 'Η συνομιλία σημάνθηκε επιλυθείσα από το σύστημα με την παρέλευση %{count} ημερών άνευ δραστηριότητας'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ffbe568ea..74dbc5c6a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -145,7 +145,9 @@ es:
         open: 'La conversación fue reabierta por %{user_name}'
         pending: 'La conversación fue marcada como pendiente por %{user_name}'
         snoozed: 'La conversación fue pospuesta por %{user_name}'
-        auto_resolved: 'La conversación fue marcada por el sistema debido a %{duration} días de inactividad'
+        auto_resolved_days: 'La conversación fue marcada por el sistema debido a %{count} días de inactividad'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: El sistema reabrió la conversación debido a un nuevo mensaje entrante.
       priority:
         added: '%{user_name} estableció la prioridad a %{new_priority}'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0dda83588..1f20e4e13 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -145,7 +145,9 @@ fa:
         open: 'گفتگو توسط ایجنت %{user_name} مجددا باز شده بود'
         pending: 'مکالمه توسط %{user_name} به عنوان معلق علامت گذاری شد'
         snoozed: 'مکالمه توسط %{user_name} به تعویق افتاد'
-        auto_resolved: 'به دلیل %{duration} روز عدم فعالیت ، مکالمه توسط سیستم بسته شد'
+        auto_resolved_days: 'به دلیل %{count} روز عدم فعالیت ، مکالمه توسط سیستم بسته شد'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: سیستم به دلیل یک پیام دریافتی جدید، مکالمه را دوباره باز کرد.
       priority:
         added: '%{user_name} اولویت را روی %{new_priority} تنظیم کرد'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 4fd442da1..34afde79b 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -145,7 +145,9 @@ fi:
         open: '%{user_name} uudelleenavasi keskustelun'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Keskustelu merkittiin ratkaistuksi automaattisesti, sillä on kulunut %{duration} päivää viimeisestä viestistä'
+        auto_resolved_days: 'Keskustelu merkittiin ratkaistuksi automaattisesti, sillä on kulunut %{count} päivää viimeisestä viestistä'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6fa2443b9..7994df163 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -145,7 +145,9 @@ fr:
         open: 'La conversation a été ré-ouverte par %{user_name}'
         pending: 'La conversation a été marquée comme en attente par %{user_name}'
         snoozed: 'La conversation a été reportée par %{user_name}'
-        auto_resolved: 'La conversation a été marquée comme résolue par le système en raison de %{duration} jours d''inactivité'
+        auto_resolved_days: 'La conversation a été marquée comme résolue par le système en raison de %{count} jours d''inactivité'
+        auto_resolved_hours: 'La conversation a été marquée comme résolue par le système en raison de %{count} heures d''inactivité'
+        auto_resolved_minutes: 'La conversation a été marquée comme résolue par le système en raison de %{count} minutes d''inactivité'
         system_auto_open: Le système a rouvert la conversation en raison d'un nouveau message entrant.
       priority:
         added: '%{user_name} fixe la priorité à %{new_priority}'
@@ -222,8 +224,8 @@ fr:
       description: 'Connect your Shopify store to access order details, customer information, and product data directly within your conversations and helps your support team provide faster, more contextual assistance to your customers.'
     leadsquared:
       name: 'LeadSquared'
-      short_description: 'Sync your contacts and conversations with LeadSquared CRM.'
-      description: 'Sync your contacts and conversations with LeadSquared CRM. This integration automatically creates leads in LeadSquared when new contacts are added, and logs conversation activity to provide your sales team with complete context.'
+      short_description: 'Synchronisez vos contacts et conversations avec LeadSquared CRM.'
+      description: 'Synchronisez vos contacts et conversations avec LeadSquared CRM. Cette intégration crée automatiquement des prospects dans LeadSquared lorsque de nouveaux contacts sont ajoutés, et enregistre l''activité des conversations pour fournir à votre équipe de vente un contexte complet.'
   captain:
     copilot_error: 'Please connect an assistant to this inbox to use Copilot'
     copilot_limit: 'You are out of Copilot credits. You can buy more credits from the billing section.'
@@ -285,24 +287,24 @@ fr:
       one: '%{count} seconde'
       other: '%{count} seconds'
   automation:
-    system_name: 'Automation System'
+    system_name: 'Système d''automatisation'
   crm:
-    no_message: 'No messages in conversation'
-    attachment: '[Attachment: %{type}]'
+    no_message: 'Aucun message dans la conversation'
+    attachment: '[Pièce jointe : %{type}]'
     no_content: '[No content]'
     created_activity: |
-      New conversation started on %{brand_name}
+      Une nouvelle conversation a été lancée sur %{brand_name}
 
-      Channel: %{channel_info}
-      Created: %{formatted_creation_time}
-      Conversation ID: %{display_id}
-      View in %{brand_name}: %{url}
+      Canal : %{channel_info}
+      Créée le : %{formatted_creation_time}
+      ID de la conversation : %{display_id}
+      Voir dans %{brand_name} : %{url}
     transcript_activity: |
-      Conversation Transcript from %{brand_name}
+      Transcription de la conversation depuis %{brand_name}
 
-      Channel: %{channel_info}
-      Conversation ID: %{display_id}
-      View in %{brand_name}: %{url}
+      Canal : %{channel_info}
+      ID de la conversation : %{display_id}
+      Voir dans %{brand_name} : %{url}
 
-      Transcript:
+      Transcription :
       %{format_messages}
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6ef731fd1..fb0eba4e8 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -145,7 +145,9 @@ he:
         open: 'השיחה נפתחה מחדש על ידי %{user_name}'
         pending: 'השיחה סומנה כממתינה על ידי %{user_name}'
         snoozed: 'השיחה הושהה על ידי %{user_name}'
-        auto_resolved: 'השיחה סומנה כפתורה על ידי המערכת עקב חוסר פעילות של %{duration} ימים'
+        auto_resolved_days: 'השיחה סומנה כפתורה על ידי המערכת עקב חוסר פעילות של %{count} ימים'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index abe8dd3d8..5cd91f77f 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -145,7 +145,9 @@ hi:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 8afb9fe78..45bda80be 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -145,7 +145,9 @@ hr:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sustav je ponovno otvorio razgovor zbog pristigle nove poruke.
       priority:
         added: '%{user_name} je postavio prioritet na %{new_priority}'
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 444d80f00..7b9ce93a2 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -145,7 +145,9 @@ hu:
         open: 'A beszélgetést újranyitotta %{user_name}'
         pending: 'A beszélgetést %{user_name} folyamatban lévőnek jelölte'
         snoozed: 'A beszélgetést %{user_name} elnémította'
-        auto_resolved: 'A beszélgetést lezárta a rendszer mivel %{duration} napja inaktív volt'
+        auto_resolved_days: 'A beszélgetést lezárta a rendszer mivel %{count} napja inaktív volt'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: A rendszer újranyitotta a beszélgetést egy új bejövő üzenet miatt.
       priority:
         added: '%{user_name} beállította a prioritást erre: %{new_priority}'
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 6dfa38a67..cd4dcb783 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -145,7 +145,9 @@ hy:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 9bc01872c..89dce8175 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -145,7 +145,9 @@ id:
         open: 'Percakapan telah dibuka kembali oleh %{user_name}'
         pending: 'Percakapan telah ditandai sebagai tertunda oleh %{user_name}'
         snoozed: 'Percakapan telah ditunda oleh %{user_name}'
-        auto_resolved: 'Percakapan ditandai terselesaikan oleh sistem karena tidak ada aktifitas dalam %{duration} hari'
+        auto_resolved_days: 'Percakapan ditandai terselesaikan oleh sistem karena tidak ada aktifitas dalam %{count} hari'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistem membuka kembali percakapan karena pesan masuk baru.
       priority:
         added: '%{user_name} tetapkan prioritas untuk %{new_priority}'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index d36eeca0d..a234cf915 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -145,7 +145,9 @@ is:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Samtal var merkt sem í bið af %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Samtal var merkt sem leyst af kerfinu vegna óvirkni í %{duration} daga'
+        auto_resolved_days: 'Samtal var merkt sem leyst af kerfinu vegna óvirkni í %{count} daga'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 998375e4a..c1cf9aa08 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -145,7 +145,9 @@ it:
         open: 'La conversazione è stata riaperta da %{user_name}'
         pending: 'La conversazione è stata contrassegnata come in attesa da %{user_name}'
         snoozed: 'La conversazione è stata posticipata da %{user_name}'
-        auto_resolved: 'La conversazione è stata contrassegnata come risolta dal sistema a causa di %{duration} giorni d''inattività'
+        auto_resolved_days: 'La conversazione è stata contrassegnata come risolta dal sistema a causa di %{count} giorni d''inattività'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d3fcc8706..82ff3adf1 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -145,7 +145,9 @@ ja:
         open: '%{user_name} によって会話が再開されました'
         pending: '%{user_name} によって会話が保留にされました'
         snoozed: '%{user_name} によって会話がスヌーズされました'
-        auto_resolved: '%{duration} 日間会話が非アクティブだったため、システムにより解決済みにされました'
+        auto_resolved_days: '%{count} 日間会話が非アクティブだったため、システムにより解決済みにされました'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: 新しい受信メッセージを受信したため、システムが会話が再開されました
       priority:
         added: '%{user_name} が優先度を "%{new_priority}" に設定しました'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 27dce6767..ad0cd5159 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -145,7 +145,9 @@ ka:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 6e7b051e5..42417b179 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -145,7 +145,9 @@ ko:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 26c57124d..00de10987 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -145,7 +145,9 @@ lt:
         open: 'Pokalbį iš naujo pradėjo %{user_name}'
         pending: 'Pokalbį pažymėjo %{user_name} kaip laukiantį'
         snoozed: 'Pokalbį atidėjo %{user_name}'
-        auto_resolved: 'Sistema pokalbį pažymėjo kaip baigtą dėl %{duration} neaktyvumo dienų'
+        auto_resolved_days: 'Sistema pokalbį pažymėjo kaip baigtą dėl %{count} neaktyvumo dienų'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistema vėl atidarė pokalbį dėl naujo gaunamo pranešimo.
       priority:
         added: '%{user_name} nustatė prioritetą į %{new_priority}'
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 3579952a5..3588f491c 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -145,7 +145,9 @@ lv:
         open: '%{user_name} atkārtoti atvēra sarunu'
         pending: '%{user_name} sarunu atzīmēja kā neapstiprinātu'
         snoozed: '%{user_name} atlika sarunu'
-        auto_resolved: 'Sistēma sarunu atzīmēja kā atrisinātu %{duration} dienu neaktivitātes dēļ'
+        auto_resolved_days: 'Sistēma sarunu atzīmēja kā atrisinātu %{count} dienu neaktivitātes dēļ'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistēma atkārtoti atvēra sarunu jauna ienākoša ziņojuma dēļ.
       priority:
         added: '%{user_name} iestatīja prioritāti uz %{new_priority}'
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 6f992f50d..676cf8624 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -145,7 +145,9 @@ ml:
         open: 'സംഭാഷണം %{user_name} വീണ്ടും തുറന്നു'
         pending: '%{user_name} സംഭാഷണം തീർച്ചപ്പെടുത്താത്തതായി അടയാളപ്പെടുത്തി'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index e23420e5c..d471144b5 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -145,7 +145,9 @@ ms:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 76d5440b2..664cb7cb1 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -145,7 +145,9 @@ ne:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6881c0939..c5c937fc3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -145,7 +145,9 @@ nl:
         open: 'Gesprek werd heropend door %{user_name}'
         pending: 'Gesprek werd gemarkeerd als in afwachting door %{user_name}'
         snoozed: 'Gesprek werd gesluimerd door %{user_name}'
-        auto_resolved: 'Gesprek werd door systeem gemarkeerd als opgelost na %{duration} dagen inactiviteit'
+        auto_resolved_days: 'Gesprek werd door systeem gemarkeerd als opgelost na %{count} dagen inactiviteit'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 00b68f9c1..ef2327236 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -145,7 +145,9 @@
         open: 'Samtalen ble gjenåpnet av %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Samtale ble automatisk merket løst på grunn av %{duration} dager med inaktivitet'
+        auto_resolved_days: 'Samtale ble automatisk merket løst på grunn av %{count} dager med inaktivitet'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 87f2ad3b5..4d3878d45 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -145,7 +145,9 @@ pl:
         open: 'Rozmowa została ponownie otwarta przez %{user_name}'
         pending: 'Rozmowa została oznaczona jako oczekująca przez %{user_name}'
         snoozed: 'Rozmowa została uśpiona przez %{user_name}'
-        auto_resolved: 'Rozmowa została oznaczona przez system jako rozwiązana z powodu %{duration} dni bezczynności'
+        auto_resolved_days: 'Rozmowa została oznaczona przez system jako rozwiązana z powodu %{count} dni bezczynności'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System otworzył ponownie rozmowę z powodu nowej wiadomości przychodzącej.
       priority:
         added: '%{user_name} ustawił priorytet na %{new_priority}'
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 4b630e66a..fe2286502 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -145,7 +145,9 @@ pt:
         open: 'Conversa foi reaberta por %{user_name}'
         pending: 'Conversa marcada como pendente por %{user_name}'
         snoozed: 'Conversa adiada por %{user_name}'
-        auto_resolved: 'Conversa auto-resolvida pelo sistema por causa dos %{duration} dias sem inatividade'
+        auto_resolved_days: 'Conversa auto-resolvida pelo sistema por causa dos %{count} dias sem inatividade'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: O sistema reabriu a conversa por ter sido recebida uma nova mensagem.
       priority:
         added: '%{user_name} definiu a prioridade para %{new_priority}'
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index a8b0f1d02..601f689ac 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -145,7 +145,9 @@ pt_BR:
         open: 'Conversa foi reaberta por %{user_name}'
         pending: 'Conversa foi marcada como pendente por %{user_name}'
         snoozed: 'Conversa foi adiada por %{user_name}'
-        auto_resolved: 'Conversa foi marcada como resolvida pelo sistema por ter %{duration} dias de inatividade'
+        auto_resolved_days: 'A conversa foi marcada como resolvida pelo sistema por ter %{count} dias de inatividade'
+        auto_resolved_hours: 'A conversa foi marcada como resolvida pelo sistema por ter %{count} horas de inatividade'
+        auto_resolved_minutes: 'A conversa foi marcada como resolvida pelo sistema por ter %{count} minutos de inatividade'
         system_auto_open: O sistema reabriu a conversa devido a uma nova mensagem recebida.
       priority:
         added: '%{user_name} definiu a prioridade para %{new_priority}'
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index c54f67349..48e03ea29 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -145,7 +145,9 @@ ro:
         open: 'Conversația a fost redeschisă de %{user_name}'
         pending: 'Conversația a fost marcată ca fiind în așteptare de către %{user_name}'
         snoozed: 'Conversația a fost snoozed de %{user_name}'
-        auto_resolved: 'Conversația a fost marcată de sistem din cauza %{duration} zile de inactivitate'
+        auto_resolved_days: 'Conversația a fost marcată de sistem din cauza %{count} zile de inactivitate'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistemul a redeschis conversația din cauza unui nou mesaj de intrare.
       priority:
         added: '%{user_name} setați prioritatea pentru a %{new_priority}'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b7117df94..f219e75c6 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -145,7 +145,9 @@ ru:
         open: '%{user_name} открыл заново диалог'
         pending: 'Разговор был помечен как ожидающий %{user_name}'
         snoozed: 'Разговор был помечен как отложенный %{user_name}'
-        auto_resolved: 'Разговор был помечен системой решённым из-за неактивности в течение %{duration} дней'
+        auto_resolved_days: 'Разговор был помечен системой решённым из-за неактивности в течение %{count} дней'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Система переоткрыла разговор из-за нового входящего сообщения.
       priority:
         added: '%{user_name} установил приоритет на %{new_priority}'
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 916685cdf..cdfb561c5 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -145,7 +145,9 @@ sh:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 9585c950a..ff7de2de9 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -145,7 +145,9 @@ sk:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index a6529051f..3d9d9746c 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -145,7 +145,9 @@ sl:
         open: '%{user_name} je znova odprl pogovor'
         pending: '%{user_name} je pogovor označil kot čakajočega'
         snoozed: '%{user_name} je preložil pogovor'
-        auto_resolved: 'Sistem je označil pogovor kot razrešen zaradi %{duration} dni nedejavnosti'
+        auto_resolved_days: 'Sistem je označil pogovor kot razrešen zaradi %{count} dni nedejavnosti'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistem je znova odprl pogovor zaradi novega dohodnega sporočila.
       priority:
         added: '%{user_name} je nastavil prednost na %{new_priority}'
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index fccbc17b2..d8e0cc689 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -145,7 +145,9 @@ sq:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index f927a0b6e..30c0a8f63 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -145,7 +145,9 @@ sr-Latn:
         open: 'Razgovor je ponovo otvoren od strane %{user_name}'
         pending: 'Razgovor je označen kao na čekanju od strane %{user_name}'
         snoozed: 'Razgovor je odložen od strane %{user_name}'
-        auto_resolved: 'Razgovor je označen kao rešen od strane sistema zbog %{duration} dana neaktivnosti'
+        auto_resolved_days: 'Razgovor je označen kao rešen od strane sistema zbog %{count} dana neaktivnosti'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 5a1931180..3cb09f24e 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -145,7 +145,9 @@ sv:
         open: 'Konversationen öppnades igen av %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Konversationen har markerats som löst av systemet på grund av %{duration} dagars inaktivitet'
+        auto_resolved_days: 'Konversationen har markerats som löst av systemet på grund av %{count} dagars inaktivitet'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 171952e23..0f2fb6b40 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -145,7 +145,9 @@ ta:
         open: 'உரையாடலை %{user_name} மீண்டும் திறந்துள்ளார்'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 031f4749b..d5b9d9ab3 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -145,7 +145,9 @@ th:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 89024bb52..11a71c04f 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -145,7 +145,9 @@ tl:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 42e1fff8e..27fc93e35 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -145,7 +145,9 @@ tr:
         open: 'Konuşma %{user_name} tarafından açık olarak işaretlendi'
         pending: 'Konuşma, %{user_name} tarafından bekleyen olarak işaretlendi'
         snoozed: 'Konuşma, %{user_name} tarafından erteledi olarak işaretlendi'
-        auto_resolved: ' %{duration} günlük hareketsizlik nedeniyle konuşma, sistem tarafından çözümlendi olarak işaretlendi'
+        auto_resolved_days: ' %{count} günlük hareketsizlik nedeniyle konuşma, sistem tarafından çözümlendi olarak işaretlendi'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Sistem, yeni gelen bir mesaj nedeniyle konuşmayı tekrar açtı.
       priority:
         added: '%{user_name} önceliği %{new_priority} olarak ayarladı'
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index bba730a83..999508e12 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -145,7 +145,9 @@ uk:
         open: 'Розмову знову відкрито %{user_name}'
         pending: 'Бесіда була позначена як очікується %{user_name}'
         snoozed: 'Розмова була відкладена %{user_name}'
-        auto_resolved: 'Діалог був закритий системою через %{duration} днів неактивності'
+        auto_resolved_days: 'Діалог був закритий системою через %{count} днів неактивності'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Система повторно відкрила розмову через нове вхідне повідомлення.
       priority:
         added: '%{user_name} встановив пріоритет %{new_priority}'
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 62df9f34f..6da50915c 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -145,7 +145,9 @@ ur:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 72c9ab3d8..75316ea8b 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -145,7 +145,9 @@ ur:
         open: 'Conversation was reopened by %{user_name}'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: 'Conversation was marked resolved by system due to %{duration} days of inactivity'
+        auto_resolved_days: 'Conversation was marked resolved by system due to %{count} days of inactivity'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 848356911..56c36eb37 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -145,7 +145,9 @@ vi:
         open: 'Cuộc trò chuyện đã được mở lại bởi %{user_name}'
         pending: 'Hội thoại được đánh dấu là chưa giải quyết bởi %{user_name}'
         snoozed: 'Hội thoại đã được tạm dừng lại bởi %{user_name}'
-        auto_resolved: 'Hội thoại được đánh dấu là đã giải quyết bởi hệ thống vì %{duration} ngày không hoạt động'
+        auto_resolved_days: 'Hội thoại được đánh dấu là đã giải quyết bởi hệ thống vì %{count} ngày không hoạt động'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: Hệ thống mở lại hội thoại do có tin nhắn mới.
       priority:
         added: '%{user_name} thiết lập độ ưu tiên thành %{new_priority}'
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 9788c1b26..7173af8c3 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -145,7 +145,9 @@ zh_CN:
         open: '对话被 %{user_name} 重新打开'
         pending: '对话被标记由 %{user_name} 待处理'
         snoozed: '对话被 %{user_name} 暂停'
-        auto_resolved: '对话被系统标记为已解决, 原因是 %{duration} 天不活跃'
+        auto_resolved_days: '对话被系统标记为已解决, 原因是 %{count} 天不活跃'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: 由于收到新的消息，系统重新打开了对话。
       priority:
         added: '%{user_name} 将优先级设置为 %{new_priority}'
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 3dd001948..b76f8926a 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -145,7 +145,9 @@ zh_TW:
         open: '被%{user_name}恢復對話。'
         pending: 'Conversation was marked as pending by %{user_name}'
         snoozed: 'Conversation was snoozed by %{user_name}'
-        auto_resolved: '由於對話已經 %{duration} 天沒有新活動，已經被系統標記為完成'
+        auto_resolved_days: '由於對話已經 %{count} 天沒有新活動，已經被系統標記為完成'
+        auto_resolved_hours: 'Conversation was marked resolved by system due to %{count} hours of inactivity'
+        auto_resolved_minutes: 'Conversation was marked resolved by system due to %{count} minutes of inactivity'
         system_auto_open: System reopened the conversation due to a new incoming message.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index 058906fa0..bf6ecbb6b 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -5,7 +5,7 @@ services:
     image: chatwoot/chatwoot:latest
     env_file: .env ## Change this file for customized env variables
     volumes:
-      - /data/storage:/app/storage
+      - storage_data:/app/storage
 
   rails:
     <<: *base
@@ -40,7 +40,7 @@ services:
     ports:
       - '127.0.0.1:5432:5432'
     volumes:
-      - /data/postgres:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=chatwoot
       - POSTGRES_USER=postgres
@@ -53,6 +53,11 @@ services:
     command: ["sh", "-c", "redis-server --requirepass \"$REDIS_PASSWORD\""]
     env_file: .env
     volumes:
-      - /data/redis:/data
+      - redis_data:/data
     ports:
       - '127.0.0.1:6379:6379'
+
+volumes:
+  storage_data:
+  postgres_data:
+  redis_data:
diff --git a/package.json b/package.json
index d09360953..88c775f28 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "prosemirror-model": "^1.22.3",
     "size-limit": "^8.2.4",
     "tailwindcss": "^3.4.13",
-    "vite": "^5.4.18",
+    "vite": "^5.4.19",
     "vite-plugin-ruby": "^5.0.0",
     "vitest": "3.0.5"
   },
@@ -154,7 +154,7 @@
   "pnpm": {
     "overrides": {
       "vite-node": "2.0.1",
-      "vite": "5.4.18",
+      "vite": "5.4.19",
       "vitest": "3.0.5"
     }
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 07d58cbcf..af7703fc6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,7 +6,7 @@ settings:
 
 overrides:
   vite-node: 2.0.1
-  vite: 5.4.18
+  vite: 5.4.19
   vitest: 3.0.5
 
 importers:
@@ -72,7 +72,7 @@ importers:
         version: 8.20.5(vue@3.5.12(typescript@5.6.2))
       '@vitejs/plugin-vue':
         specifier: ^5.1.4
-        version: 5.1.4(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
+        version: 5.1.4(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
       '@vue/compiler-sfc':
         specifier: ^3.5.8
         version: 3.5.8
@@ -238,7 +238,7 @@ importers:
         version: 1.8.1(tailwindcss@3.4.13)
       '@histoire/plugin-vue':
         specifier: 0.17.15
-        version: 0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
+        version: 0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
       '@iconify-json/logos':
         specifier: ^1.2.3
         version: 1.2.3
@@ -301,7 +301,7 @@ importers:
         version: 6.0.0
       histoire:
         specifier: 0.17.15
-        version: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+        version: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       husky:
         specifier: ^7.0.0
         version: 7.0.4
@@ -330,11 +330,11 @@ importers:
         specifier: ^3.4.13
         version: 3.4.13
       vite:
-        specifier: 5.4.18
-        version: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+        specifier: 5.4.19
+        version: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vite-plugin-ruby:
         specifier: ^5.0.0
-        version: 5.0.0(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+        version: 5.0.0(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       vitest:
         specifier: 3.0.5
         version: 3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0)
@@ -860,7 +860,7 @@ packages:
   '@histoire/shared@0.17.17':
     resolution: {integrity: sha512-ueGtURysonT0MujCObPCR57+mgZluMEXCrbc2FBgKAD/DoAt38tNwSGsmLldk2O6nTr7lr6ClbVSgWrLwgY6Xw==}
     peerDependencies:
-      vite: 5.4.18
+      vite: 5.4.19
 
   '@histoire/vendors@0.17.17':
     resolution: {integrity: sha512-QZvmffdoJlLuYftPIkOU5Q2FPAdG2JjMuQ5jF7NmEl0n1XnmbMqtRkdYTZ4eF6CO1KLZ0Zyf6gBQvoT1uWNcjA==}
@@ -1039,103 +1039,103 @@ packages:
   '@rails/ujs@7.1.400':
     resolution: {integrity: sha512-YwvXm3BR5tn+VCAKYGycLejMRVZE3Ionj5gFjEeGXCZnI0Rpi+7dKpmyu90kdUY7dRUFpHTdu9zZceEzFLl38w==}
 
-  '@rollup/rollup-android-arm-eabi@4.40.0':
-    resolution: {integrity: sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==}
+  '@rollup/rollup-android-arm-eabi@4.40.2':
+    resolution: {integrity: sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.40.0':
-    resolution: {integrity: sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==}
+  '@rollup/rollup-android-arm64@4.40.2':
+    resolution: {integrity: sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.40.0':
-    resolution: {integrity: sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==}
+  '@rollup/rollup-darwin-arm64@4.40.2':
+    resolution: {integrity: sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.40.0':
-    resolution: {integrity: sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==}
+  '@rollup/rollup-darwin-x64@4.40.2':
+    resolution: {integrity: sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.40.0':
-    resolution: {integrity: sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==}
+  '@rollup/rollup-freebsd-arm64@4.40.2':
+    resolution: {integrity: sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.40.0':
-    resolution: {integrity: sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==}
+  '@rollup/rollup-freebsd-x64@4.40.2':
+    resolution: {integrity: sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.40.0':
-    resolution: {integrity: sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.40.2':
+    resolution: {integrity: sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.40.0':
-    resolution: {integrity: sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==}
+  '@rollup/rollup-linux-arm-musleabihf@4.40.2':
+    resolution: {integrity: sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.40.0':
-    resolution: {integrity: sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==}
+  '@rollup/rollup-linux-arm64-gnu@4.40.2':
+    resolution: {integrity: sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.40.0':
-    resolution: {integrity: sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==}
+  '@rollup/rollup-linux-arm64-musl@4.40.2':
+    resolution: {integrity: sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
-    resolution: {integrity: sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==}
+  '@rollup/rollup-linux-loongarch64-gnu@4.40.2':
+    resolution: {integrity: sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==}
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
-    resolution: {integrity: sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==}
+  '@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
+    resolution: {integrity: sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.40.0':
-    resolution: {integrity: sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==}
+  '@rollup/rollup-linux-riscv64-gnu@4.40.2':
+    resolution: {integrity: sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.40.0':
-    resolution: {integrity: sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==}
+  '@rollup/rollup-linux-riscv64-musl@4.40.2':
+    resolution: {integrity: sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.40.0':
-    resolution: {integrity: sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==}
+  '@rollup/rollup-linux-s390x-gnu@4.40.2':
+    resolution: {integrity: sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.40.0':
-    resolution: {integrity: sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==}
+  '@rollup/rollup-linux-x64-gnu@4.40.2':
+    resolution: {integrity: sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.40.0':
-    resolution: {integrity: sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==}
+  '@rollup/rollup-linux-x64-musl@4.40.2':
+    resolution: {integrity: sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-win32-arm64-msvc@4.40.0':
-    resolution: {integrity: sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==}
+  '@rollup/rollup-win32-arm64-msvc@4.40.2':
+    resolution: {integrity: sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.40.0':
-    resolution: {integrity: sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==}
+  '@rollup/rollup-win32-ia32-msvc@4.40.2':
+    resolution: {integrity: sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.40.0':
-    resolution: {integrity: sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==}
+  '@rollup/rollup-win32-x64-msvc@4.40.2':
+    resolution: {integrity: sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==}
     cpu: [x64]
     os: [win32]
 
@@ -1800,7 +1800,7 @@ packages:
     resolution: {integrity: sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
-      vite: 5.4.18
+      vite: 5.4.19
       vue: ^3.2.25
 
   '@vitest/coverage-v8@3.0.5':
@@ -1819,7 +1819,7 @@ packages:
     resolution: {integrity: sha512-CLPNBFBIE7x6aEGbIjaQAX03ZZlBMaWwAjBdMkIf/cAn6xzLTiM3zYqO/WAbieEjsAZir6tO71mzeHZoodThvw==}
     peerDependencies:
       msw: ^2.4.9
-      vite: 5.4.18
+      vite: 5.4.19
     peerDependenciesMeta:
       msw:
         optional: true
@@ -3100,7 +3100,7 @@ packages:
     resolution: {integrity: sha512-DiRMSIgj340z+zikqf0f3Pj0CTv2/xtdBMBIAO1EARat+QXxMwumbfK41Gi7f9IIBr+UVmomNcwFxVY2EM/vrw==}
     hasBin: true
     peerDependencies:
-      vite: 5.4.18
+      vite: 5.4.19
 
   hotkeys-js@3.8.7:
     resolution: {integrity: sha512-ckAx3EkUr5XjDwjEHDorHxRO2Kb7z6Z2Sxul4MbBkN8Nho7XDslQsgMJT+CiJ5Z4TgRxxvKHEpuLE3imzqy4Lg==}
@@ -4344,8 +4344,8 @@ packages:
     deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
-  rollup@4.40.0:
-    resolution: {integrity: sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==}
+  rollup@4.40.2:
+    resolution: {integrity: sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -4863,10 +4863,10 @@ packages:
   vite-plugin-ruby@5.0.0:
     resolution: {integrity: sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==}
     peerDependencies:
-      vite: 5.4.18
+      vite: 5.4.19
 
-  vite@5.4.18:
-    resolution: {integrity: sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==}
+  vite@5.4.19:
+    resolution: {integrity: sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -5672,10 +5672,10 @@ snapshots:
       highlight.js: 11.10.0
       vue: 3.5.12(typescript@5.6.2)
 
-  '@histoire/app@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+  '@histoire/app@0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
-      '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
-      '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/controls': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/shared': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@histoire/vendors': 0.17.17
       '@types/flexsearch': 0.7.6
       flexsearch: 0.7.21
@@ -5683,7 +5683,7 @@ snapshots:
     transitivePeerDependencies:
       - vite
 
-  '@histoire/controls@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+  '@histoire/controls@0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
       '@codemirror/commands': 6.7.0
       '@codemirror/lang-json': 6.0.1
@@ -5692,26 +5692,26 @@ snapshots:
       '@codemirror/state': 6.4.1
       '@codemirror/theme-one-dark': 6.1.2
       '@codemirror/view': 6.34.1
-      '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/shared': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@histoire/vendors': 0.17.17
     transitivePeerDependencies:
       - vite
 
-  '@histoire/plugin-vue@0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
+  '@histoire/plugin-vue@0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
     dependencies:
-      '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
-      '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/controls': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/shared': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@histoire/vendors': 0.17.17
       change-case: 4.1.2
       globby: 13.2.2
-      histoire: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      histoire: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       launch-editor: 2.9.1
       pathe: 1.1.2
       vue: 3.5.12(typescript@5.6.2)
     transitivePeerDependencies:
       - vite
 
-  '@histoire/shared@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+  '@histoire/shared@0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
       '@histoire/vendors': 0.17.17
       '@types/fs-extra': 9.0.13
@@ -5719,7 +5719,7 @@ snapshots:
       chokidar: 3.6.0
       pathe: 1.1.2
       picocolors: 1.1.0
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
 
   '@histoire/vendors@0.17.17': {}
 
@@ -5944,64 +5944,64 @@ snapshots:
 
   '@rails/ujs@7.1.400': {}
 
-  '@rollup/rollup-android-arm-eabi@4.40.0':
+  '@rollup/rollup-android-arm-eabi@4.40.2':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.40.0':
+  '@rollup/rollup-android-arm64@4.40.2':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.40.0':
+  '@rollup/rollup-darwin-arm64@4.40.2':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.40.0':
+  '@rollup/rollup-darwin-x64@4.40.2':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.40.0':
+  '@rollup/rollup-freebsd-arm64@4.40.2':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.40.0':
+  '@rollup/rollup-freebsd-x64@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.40.0':
+  '@rollup/rollup-linux-arm-gnueabihf@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.40.0':
+  '@rollup/rollup-linux-arm-musleabihf@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.40.0':
+  '@rollup/rollup-linux-arm64-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.40.0':
+  '@rollup/rollup-linux-arm64-musl@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
+  '@rollup/rollup-linux-loongarch64-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.40.0':
+  '@rollup/rollup-linux-riscv64-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.40.0':
+  '@rollup/rollup-linux-riscv64-musl@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.40.0':
+  '@rollup/rollup-linux-s390x-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.40.0':
+  '@rollup/rollup-linux-x64-gnu@4.40.2':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.40.0':
+  '@rollup/rollup-linux-x64-musl@4.40.2':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.40.0':
+  '@rollup/rollup-win32-arm64-msvc@4.40.2':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.40.0':
+  '@rollup/rollup-win32-ia32-msvc@4.40.2':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.40.0':
+  '@rollup/rollup-win32-x64-msvc@4.40.2':
     optional: true
 
   '@rtsao/scc@1.1.0': {}
@@ -6802,9 +6802,9 @@ snapshots:
       global: 4.4.0
       is-function: 1.0.2
 
-  '@vitejs/plugin-vue@5.1.4(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
+  '@vitejs/plugin-vue@5.1.4(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
     dependencies:
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vue: 3.5.12(typescript@5.6.2)
 
   '@vitest/coverage-v8@3.0.5(vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0))':
@@ -6832,13 +6832,13 @@ snapshots:
       chai: 5.1.2
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.0.5(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+  '@vitest/mocker@3.0.5(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
     dependencies:
       '@vitest/spy': 3.0.5
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
 
   '@vitest/pretty-format@3.0.5':
     dependencies:
@@ -8393,12 +8393,12 @@ snapshots:
 
   highlight.js@11.10.0: {}
 
-  histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
+  histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
     dependencies:
       '@akryum/tinypool': 0.3.1
-      '@histoire/app': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
-      '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
-      '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/app': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/controls': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@histoire/shared': 0.17.17(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@histoire/vendors': 0.17.17
       '@types/flexsearch': 0.7.6
       '@types/markdown-it': 12.2.3
@@ -8425,7 +8425,7 @@ snapshots:
       sade: 1.8.1
       shiki-es: 0.2.0
       sirv: 2.0.4
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vite-node: 2.0.1(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
     transitivePeerDependencies:
       - '@types/node'
@@ -9766,30 +9766,30 @@ snapshots:
     dependencies:
       glob: 7.2.3
 
-  rollup@4.40.0:
+  rollup@4.40.2:
     dependencies:
       '@types/estree': 1.0.7
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.40.0
-      '@rollup/rollup-android-arm64': 4.40.0
-      '@rollup/rollup-darwin-arm64': 4.40.0
-      '@rollup/rollup-darwin-x64': 4.40.0
-      '@rollup/rollup-freebsd-arm64': 4.40.0
-      '@rollup/rollup-freebsd-x64': 4.40.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.40.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.40.0
-      '@rollup/rollup-linux-arm64-gnu': 4.40.0
-      '@rollup/rollup-linux-arm64-musl': 4.40.0
-      '@rollup/rollup-linux-loongarch64-gnu': 4.40.0
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.40.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.40.0
-      '@rollup/rollup-linux-riscv64-musl': 4.40.0
-      '@rollup/rollup-linux-s390x-gnu': 4.40.0
-      '@rollup/rollup-linux-x64-gnu': 4.40.0
-      '@rollup/rollup-linux-x64-musl': 4.40.0
-      '@rollup/rollup-win32-arm64-msvc': 4.40.0
-      '@rollup/rollup-win32-ia32-msvc': 4.40.0
-      '@rollup/rollup-win32-x64-msvc': 4.40.0
+      '@rollup/rollup-android-arm-eabi': 4.40.2
+      '@rollup/rollup-android-arm64': 4.40.2
+      '@rollup/rollup-darwin-arm64': 4.40.2
+      '@rollup/rollup-darwin-x64': 4.40.2
+      '@rollup/rollup-freebsd-arm64': 4.40.2
+      '@rollup/rollup-freebsd-x64': 4.40.2
+      '@rollup/rollup-linux-arm-gnueabihf': 4.40.2
+      '@rollup/rollup-linux-arm-musleabihf': 4.40.2
+      '@rollup/rollup-linux-arm64-gnu': 4.40.2
+      '@rollup/rollup-linux-arm64-musl': 4.40.2
+      '@rollup/rollup-linux-loongarch64-gnu': 4.40.2
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.40.2
+      '@rollup/rollup-linux-riscv64-gnu': 4.40.2
+      '@rollup/rollup-linux-riscv64-musl': 4.40.2
+      '@rollup/rollup-linux-s390x-gnu': 4.40.2
+      '@rollup/rollup-linux-x64-gnu': 4.40.2
+      '@rollup/rollup-linux-x64-musl': 4.40.2
+      '@rollup/rollup-win32-arm64-msvc': 4.40.2
+      '@rollup/rollup-win32-ia32-msvc': 4.40.2
+      '@rollup/rollup-win32-x64-msvc': 4.40.2
       fsevents: 2.3.3
 
   rope-sequence@1.3.2: {}
@@ -10378,7 +10378,7 @@ snapshots:
       debug: 4.4.0
       pathe: 1.1.2
       picocolors: 1.1.1
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -10390,19 +10390,19 @@ snapshots:
       - supports-color
       - terser
 
-  vite-plugin-ruby@5.0.0(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
+  vite-plugin-ruby@5.0.0(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
     dependencies:
       debug: 4.3.5
       fast-glob: 3.3.2
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
     transitivePeerDependencies:
       - supports-color
 
-  vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0):
+  vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.3
-      rollup: 4.40.0
+      rollup: 4.40.2
     optionalDependencies:
       '@types/node': 22.7.0
       fsevents: 2.3.3
@@ -10412,7 +10412,7 @@ snapshots:
   vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0):
     dependencies:
       '@vitest/expect': 3.0.5
-      '@vitest/mocker': 3.0.5(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+      '@vitest/mocker': 3.0.5(vite@5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
       '@vitest/pretty-format': 3.0.5
       '@vitest/runner': 3.0.5
       '@vitest/snapshot': 3.0.5
@@ -10428,7 +10428,7 @@ snapshots:
       tinyexec: 0.3.2
       tinypool: 1.0.2
       tinyrainbow: 2.0.0
-      vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+      vite: 5.4.19(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       vite-node: 2.0.1(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index d93886fc3..a3697be84 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -843,7 +843,7 @@ RSpec.describe 'Conversations API', type: :request do
         create(:inbox_member, user: agent, inbox: conversation.inbox)
       end
 
-      it 'updates last seen' do
+      it 'updates custom attributes' do
         post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/custom_attributes",
              headers: agent.create_new_auth_token,
              params: valid_params,
@@ -854,6 +854,27 @@ RSpec.describe 'Conversations API', type: :request do
         expect(conversation.reload.custom_attributes.count).to eq 3
       end
     end
+
+    context 'when it is a bot' do
+      let(:agent_bot) { create(:agent_bot, account: account) }
+      let(:custom_attributes) { { bot_id: 1001, flow_name: 'support_flow', step: 'greeting' } }
+      let(:valid_params) { { custom_attributes: custom_attributes } }
+
+      before do
+        create(:agent_bot_inbox, agent_bot: agent_bot, inbox: conversation.inbox)
+      end
+
+      it 'updates custom attributes' do
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/custom_attributes",
+             headers: { api_access_token: agent_bot.access_token.token },
+             params: valid_params,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(conversation.reload.custom_attributes).not_to be_nil
+        expect(conversation.reload.custom_attributes.count).to eq 3
+      end
+    end
   end
 
   describe 'GET /api/v1/accounts/{account.id}/conversations/:id/attachments' do
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 618d6fa5f..ec49ecd39 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -190,6 +190,7 @@ RSpec.describe 'Accounts API', type: :request do
         support_email: 'care@example.com',
         auto_resolve_after: 40,
         auto_resolve_message: 'Auto resolved',
+        auto_resolve_ignore_waiting: false,
         timezone: 'Asia/Kolkata',
         industry: 'Technology',
         company_size: '1-10'
@@ -207,7 +208,7 @@ RSpec.describe 'Accounts API', type: :request do
         expect(account.reload.domain).to eq(params[:domain])
         expect(account.reload.support_email).to eq(params[:support_email])
 
-        %w[auto_resolve_after auto_resolve_message].each do |attribute|
+        %w[auto_resolve_after auto_resolve_message auto_resolve_ignore_waiting].each do |attribute|
           expect(account.reload.settings[attribute]).to eq(params[attribute.to_sym])
         end
 
diff --git a/spec/jobs/conversations/resolution_job_spec.rb b/spec/jobs/conversations/resolution_job_spec.rb
index 490845eec..0103bd72b 100644
--- a/spec/jobs/conversations/resolution_job_spec.rb
+++ b/spec/jobs/conversations/resolution_job_spec.rb
@@ -17,18 +17,40 @@ RSpec.describe Conversations::ResolutionJob do
     expect(conversation.reload.status).to eq('open')
   end
 
-  it 'resolves the issue if time of inactivity is more than the auto resolve duration' do
-    account.update(auto_resolve_after: 14_400) # 10 days in minutes
-    conversation.update(last_activity_at: 13.days.ago, waiting_since: nil)
-    described_class.perform_now(account: account)
-    expect(conversation.reload.status).to eq('resolved')
+  context 'when auto_resolve_ignore_waiting is true' do
+    it 'resolves non-waiting conversations if time of inactivity is more than auto resolve duration' do
+      account.update(auto_resolve_after: 14_400, auto_resolve_ignore_waiting: true) # 10 days in minutes
+      conversation.update(last_activity_at: 13.days.ago, waiting_since: nil)
+      described_class.perform_now(account: account)
+      expect(conversation.reload.status).to eq('resolved')
+    end
+
+    it 'does not resolve waiting conversations even if time of inactivity is more than auto resolve duration' do
+      account.update(auto_resolve_after: 14_400, auto_resolve_ignore_waiting: true) # 10 days in minutes
+      conversation.update(last_activity_at: 13.days.ago, waiting_since: 13.days.ago)
+      described_class.perform_now(account: account)
+      expect(conversation.reload.status).to eq('open')
+    end
   end
 
-  it 'resolved only a limited number of conversations in a single execution' do
+  context 'when auto_resolve_ignore_waiting is false' do
+    it 'resolves all conversations if time of inactivity is more than auto resolve duration' do
+      account.update(auto_resolve_after: 14_400, auto_resolve_ignore_waiting: false) # 10 days in minutes
+      # Create one waiting conversation and one non-waiting conversation
+      waiting_conversation = create(:conversation, account: account, last_activity_at: 13.days.ago, waiting_since: 13.days.ago)
+      non_waiting_conversation = create(:conversation, account: account, last_activity_at: 13.days.ago, waiting_since: nil)
+
+      described_class.perform_now(account: account)
+
+      expect(waiting_conversation.reload.status).to eq('resolved')
+      expect(non_waiting_conversation.reload.status).to eq('resolved')
+    end
+  end
+
+  it 'resolves only a limited number of conversations in a single execution' do
     stub_const('Limits::BULK_ACTIONS_LIMIT', 2)
-    account.update(auto_resolve_after: 14_400) # 10 days in minutes
-    conversations = create_list(:conversation, 3, account: account, last_activity_at: 13.days.ago)
-    conversations.each { |conversation| conversation.update(waiting_since: nil) }
+    account.update(auto_resolve_after: 14_400, auto_resolve_ignore_waiting: false) # 10 days in minutes
+    create_list(:conversation, 3, account: account, last_activity_at: 13.days.ago)
     described_class.perform_now(account: account)
     expect(account.conversations.resolved.count).to eq(Limits::BULK_ACTIONS_LIMIT)
   end
diff --git a/spec/jobs/internal/process_stale_contacts_job_spec.rb b/spec/jobs/internal/process_stale_contacts_job_spec.rb
index f7f17bf78..ca873756c 100644
--- a/spec/jobs/internal/process_stale_contacts_job_spec.rb
+++ b/spec/jobs/internal/process_stale_contacts_job_spec.rb
@@ -3,44 +3,62 @@ require 'rails_helper'
 RSpec.describe Internal::ProcessStaleContactsJob do
   subject(:job) { described_class.perform_later }
 
-  it 'enqueues the job' do
-    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
-    expect { job }.to have_enqueued_job(described_class)
-      .on_queue('housekeeping')
+  context 'when in cloud environment' do
+    before do
+      allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
+    end
+
+    it 'processes accounts based on the day of month' do
+      # Set a fixed day for testing
+      day_of_month = 16
+      remainder = day_of_month % described_class::DISTRIBUTION_GROUPS
+      allow(Date).to receive(:current).and_return(Date.new(2025, 5, day_of_month))
+
+      # Create an account and set its ID to match today's pattern
+      account = create(:account)
+      allow(account).to receive(:id).and_return(remainder)
+
+      # Mock the Account.where to return our filtered accounts
+      account_relation = double
+      allow(Account).to receive(:where).with("id % #{described_class::DISTRIBUTION_GROUPS} = ?", remainder).and_return(account_relation)
+      allow(account_relation).to receive(:find_each).and_yield(account)
+
+      # Mock the delay setting
+      allow(Internal::RemoveStaleContactsJob).to receive(:set).and_return(Internal::RemoveStaleContactsJob)
+      expect(Internal::RemoveStaleContactsJob).to receive(:perform_later).with(account)
+
+      described_class.perform_now
+    end
+
+    it 'adds a delay between jobs' do
+      day_of_month = 15
+      remainder = day_of_month % described_class::DISTRIBUTION_GROUPS
+      allow(Date).to receive(:current).and_return(Date.new(2025, 5, day_of_month))
+
+      account = create(:account)
+
+      account_relation = double
+      allow(Account).to receive(:where).with("id % #{described_class::DISTRIBUTION_GROUPS} = ?", remainder).and_return(account_relation)
+      allow(account_relation).to receive(:find_each).and_yield(account)
+
+      expect(Internal::RemoveStaleContactsJob).to receive(:set) do |args|
+        expect(args[:wait]).to be_between(1.minute, 10.minutes)
+        Internal::RemoveStaleContactsJob
+      end
+      expect(Internal::RemoveStaleContactsJob).to receive(:perform_later).with(account)
+
+      described_class.perform_now
+    end
   end
 
-  it 'enqueues RemoveStaleContactsJob for each account' do
-    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
-    account1 = create(:account)
-    account2 = create(:account)
-    account3 = create(:account)
+  context 'when not in cloud environment' do
+    it 'does not process any accounts' do
+      allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(false)
 
-    expect { described_class.perform_now }.to have_enqueued_job(Internal::RemoveStaleContactsJob)
-      .with(account1)
-      .on_queue('housekeeping')
-    expect { described_class.perform_now }.to have_enqueued_job(Internal::RemoveStaleContactsJob)
-      .with(account2)
-      .on_queue('housekeeping')
-    expect { described_class.perform_now }.to have_enqueued_job(Internal::RemoveStaleContactsJob)
-      .with(account3)
-      .on_queue('housekeeping')
-  end
+      expect(Account).not_to receive(:where)
+      expect(Internal::RemoveStaleContactsJob).not_to receive(:perform_later)
 
-  it 'processes accounts in batches' do
-    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
-    account = create(:account)
-    allow(Account).to receive(:find_in_batches).with(batch_size: 100).and_yield([account])
-
-    expect(Internal::RemoveStaleContactsJob).to receive(:perform_later).with(account)
-    described_class.perform_now
-  end
-
-  it 'does not process accounts when not in cloud environment' do
-    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(false)
-    create(:account)
-
-    expect(Account).not_to receive(:find_in_batches)
-    expect(Internal::RemoveStaleContactsJob).not_to receive(:perform_later)
-    described_class.perform_now
+      described_class.perform_now
+    end
   end
 end
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index 736db07d0..5062b11bc 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -279,4 +279,79 @@ describe WebhookListener do
       end
     end
   end
+
+  describe '#conversation_typing_on' do
+    let(:event_name) { :'conversation.typing_on' }
+    let!(:typing_event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: user) }
+
+    context 'when webhook is not configured' do
+      it 'does not trigger webhook' do
+        expect(WebhookJob).not_to receive(:perform_later)
+        listener.conversation_typing_on(typing_event)
+      end
+    end
+
+    context 'when webhook is configured' do
+      it 'triggers webhook' do
+        webhook = create(:webhook, inbox: inbox, account: account, subscriptions: ['conversation_typing_on'])
+
+        payload = {
+          event: 'conversation_typing_on',
+          user: user.webhook_data,
+          conversation: conversation.webhook_data,
+          is_private: false
+        }
+
+        expect(WebhookJob).to receive(:perform_later).with(webhook.url, payload).once
+        listener.conversation_typing_on(typing_event)
+      end
+    end
+
+    context 'when inbox is an API Channel' do
+      it 'triggers webhook if webhook_url is present' do
+        channel_api = create(:channel_api, account: account)
+        api_inbox = channel_api.inbox
+        api_conversation = create(:conversation, account: account, inbox: api_inbox, assignee: user)
+        api_event = Events::Base.new(event_name, Time.zone.now, conversation: api_conversation, user: user, is_private: false)
+
+        payload = {
+          event: 'conversation_typing_on',
+          user: user.webhook_data,
+          conversation: api_conversation.webhook_data,
+          is_private: false
+        }
+
+        expect(WebhookJob).to receive(:perform_later).with(channel_api.webhook_url, payload, :api_inbox_webhook).once
+        listener.conversation_typing_on(api_event)
+      end
+    end
+  end
+
+  describe '#conversation_typing_off' do
+    let(:event_name) { :'conversation.typing_off' }
+    let!(:typing_event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: user, is_private: false) }
+
+    context 'when webhook is not configured' do
+      it 'does not trigger webhook' do
+        expect(WebhookJob).not_to receive(:perform_later)
+        listener.conversation_typing_off(typing_event)
+      end
+    end
+
+    context 'when webhook is configured' do
+      it 'triggers webhook' do
+        webhook = create(:webhook, inbox: inbox, account: account, subscriptions: ['conversation_typing_off'])
+
+        payload = {
+          event: 'conversation_typing_off',
+          user: user.webhook_data,
+          conversation: conversation.webhook_data,
+          is_private: false
+        }
+
+        expect(WebhookJob).to receive(:perform_later).with(webhook.url, payload).once
+        listener.conversation_typing_off(typing_event)
+      end
+    end
+  end
 end
diff --git a/swagger/definitions/error/bad_request.yml b/swagger/definitions/error/bad_request.yml
index b6facb361..f103edcb5 100644
--- a/swagger/definitions/error/bad_request.yml
+++ b/swagger/definitions/error/bad_request.yml
@@ -6,4 +6,4 @@ properties:
   errors:
     type: array
     items:
-      $ref: '#/definitions/request_error'
+      $ref: '#/components/schemas/request_error'
diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index d11ec7988..8514a3957 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -1,13 +1,11 @@
-##  ---------- ERRORS ------------- ##
+## ---------- ERRORS -------------- ##
 ## -------------------------------- ##
 bad_request_error:
   $ref: ./error/bad_request.yml
 request_error:
   $ref: ./error/request.yml
 
-
-
-##  ---------- RESOURCE ------------- ##
+## ---------- RESOURCE ------------ ##
 ## -------------------------------- ##
 
 generic_id:
@@ -24,10 +22,6 @@ category:
   $ref: ./resource/category.yml
 article:
   $ref: ./resource/article.yml
-category:
-  $ref: ./resource/category.yml
-article:
-  $ref: ./resource/article.yml
 contact:
   $ref: ./resource/contact.yml
 conversation:
@@ -52,6 +46,8 @@ webhook:
   $ref: ./resource/webhook.yml
 account:
   $ref: ./resource/account.yml
+account_user:
+  $ref: ./resource/account_user.yml
 platform_account:
   $ref: ./resource/platform_account.yml
 team:
@@ -71,13 +67,18 @@ public_message:
 public_inbox:
   $ref: ./resource/public/inbox.yml
 
-
-##  ---------- REQUEST------------- ##
+## ---------- REQUEST ------------- ##
 ## -------------------------------- ##
 
 account_create_update_payload:
   $ref: ./request/account/create_update_payload.yml
 
+account_user_create_update_payload:
+  $ref: ./request/account_user/create_update_payload.yml
+
+platform_agent_bot_create_update_payload:
+  $ref: ./request/platform/agent_bot/create_update_payload.yml
+
 agent_bot_create_update_payload:
   $ref: ./request/agent_bot/create_update_payload.yml
 
@@ -89,21 +90,36 @@ canned_response_create_update_payload:
 
 custom_attribute_create_update_payload:
   $ref: ./request/custom_attribute/create_update_payload.yml
-## contact
-contact_create:
-  $ref: ./request/contact/create.yml
-contact_update:
-  $ref: ./request/contact/update.yml
 
-## conversation
-conversation_message_create:
-  $ref: ./request/conversation/create_message.yml
+## Agent
+agent_create_payload:
+  $ref: ./request/agent/create_payload.yml
+agent_update_payload:
+  $ref: ./request/agent/update_payload.yml
 
-# Team request Payload
+## Contact
+contact_create_payload:
+  $ref: ./request/contact/create_payload.yml
+contact_update_payload:
+  $ref: ./request/contact/update_payload.yml
+
+## Conversation
+conversation_create_payload:
+  $ref: ./request/conversation/create_payload.yml
+conversation_message_create_payload:
+  $ref: ./request/conversation/create_message_payload.yml
+
+# Inbox
+inbox_create_payload:
+  $ref: ./request/inbox/create_payload.yml
+inbox_update_payload:
+  $ref: ./request/inbox/update_payload.yml
+
+# Team
 team_create_update_payload:
   $ref: ./request/team/create_update_payload.yml
 
-# Custom Filter request Payload
+# Custom Filter
 custom_filter_create_update_payload:
   $ref: ./request/custom_filter/create_update_payload.yml
 
@@ -128,7 +144,6 @@ category_create_update_payload:
 article_create_update_payload:
   $ref: ./request/portal/article_create_update_payload.yml
 
-
 ## public requests
 public_contact_create_update_payload:
   $ref: ./request/public/contact/create_update_payload.yml
@@ -141,37 +156,37 @@ public_message_update_payload:
 public_conversation_create_payload:
   $ref: ./request/public/conversation/create_payload.yml
 
-##  ---------- RESPONSE ------------- ##
+## ---------- RESPONSE ------------ ##
 ## -------------------------------- ##
 
-## contact
+## Contact
 extended_contact:
   allOf:
-    - $ref: '#/definitions/contact'
+    - $ref: '#/components/schemas/contact'
     - $ref: ./resource/extension/contact/show.yml
 contact_base:
   allOf:
-    - $ref: '#/definitions/generic_id'
-    - $ref: '#/definitions/contact'
+    - $ref: '#/components/schemas/generic_id'
+    - $ref: '#/components/schemas/contact'
 contact_list:
   type: array
   description: 'array of contacts'
   items:
     allOf:
-      - $ref: '#/definitions/generic_id'
-      - $ref: '#/definitions/contact'
+      - $ref: '#/components/schemas/generic_id'
+      - $ref: '#/components/schemas/contact'
 contact_conversations:
   type: array
   description: 'array of conversations'
   items:
     allOf:
-      - $ref: '#/definitions/conversation'
+      - $ref: '#/components/schemas/conversation'
       - $ref: ./resource/extension/contact/conversation.yml
       - $ref: ./resource/extension/conversation/with_display_id.yml
 contact_labels:
   $ref: ./resource/extension/contact/labels.yml
 
-## conversation
+## Conversation
 conversation_list:
   $ref: ./resource/extension/conversation/list.yml
 conversation_show:
@@ -181,8 +196,7 @@ conversation_status_toggle:
 conversation_labels:
   $ref: ./resource/extension/conversation/labels.yml
 
-
-## report
+## Report
 account_summary:
   $ref: './resource/reports/summary.yml'
 agent_conversation_metrics:
diff --git a/swagger/definitions/request/account/create_update_payload.yml b/swagger/definitions/request/account/create_update_payload.yml
index 63c0eed13..b11b82373 100644
--- a/swagger/definitions/request/account/create_update_payload.yml
+++ b/swagger/definitions/request/account/create_update_payload.yml
@@ -3,3 +3,29 @@ properties:
   name:
     type: string
     description: Name of the account
+    example: 'My Account'
+  locale:
+    type: string
+    description: The locale of the account
+    example: 'en'
+  domain:
+    type: string
+    description: The domain of the account
+    example: 'example.com'
+  support_email:
+    type: string
+    description: The support email of the account
+    example: 'support@example.com'
+  status:
+    type: string
+    enum: ['active', 'suspended']
+    description: The status of the account
+    example: 'active'
+  limits:
+    type: object
+    description: The limits of the account
+    example: {}
+  custom_attributes:
+    type: object
+    description: The custom attributes of the account
+    example: {}
diff --git a/swagger/definitions/request/account_user/create_update_payload.yml b/swagger/definitions/request/account_user/create_update_payload.yml
new file mode 100644
index 000000000..d2982c4cf
--- /dev/null
+++ b/swagger/definitions/request/account_user/create_update_payload.yml
@@ -0,0 +1,13 @@
+type: object
+required:
+  - user_id
+  - role
+properties:
+  user_id:
+    type: integer
+    description: The ID of the user
+    example: 1
+  role:
+    type: string
+    description: whether user is an administrator or agent
+    example: administrator
diff --git a/swagger/definitions/request/agent/create_payload.yml b/swagger/definitions/request/agent/create_payload.yml
new file mode 100644
index 000000000..1daeae83a
--- /dev/null
+++ b/swagger/definitions/request/agent/create_payload.yml
@@ -0,0 +1,28 @@
+type: object
+required:
+  - name
+  - email
+  - role
+properties:
+  name:
+    type: string
+    description: Full Name of the agent
+    example: 'John Doe'
+  email:
+    type: string
+    description: Email of the Agent
+    example: 'john.doe@acme.inc'
+  role:
+    type: string
+    enum: ['agent', 'administrator']
+    description: Whether its administrator or agent
+    example: 'agent'
+  availability_status:
+    type: string
+    enum: ['available', 'busy', 'offline']
+    description: The availability setting of the agent.
+    example: 'available'
+  auto_offline:
+    type: boolean
+    description: Whether the availability status of agent is configured to go offline automatically when away.
+    example: true
diff --git a/swagger/definitions/request/agent/update_payload.yml b/swagger/definitions/request/agent/update_payload.yml
new file mode 100644
index 000000000..fc8d1457d
--- /dev/null
+++ b/swagger/definitions/request/agent/update_payload.yml
@@ -0,0 +1,18 @@
+type: object
+required:
+  - role
+properties:
+  role:
+    type: string
+    enum: ['agent', 'administrator']
+    description: Whether its administrator or agent
+    example: 'agent'
+  availability_status:
+    type: string
+    enum: ['available', 'busy', 'offline']
+    description: The availability status of the agent.
+    example: 'available'
+  auto_offline:
+    type: boolean
+    description: Whether the availability status of agent is configured to go offline automatically when away.
+    example: true
diff --git a/swagger/definitions/request/agent_bot/create_update_payload.yml b/swagger/definitions/request/agent_bot/create_update_payload.yml
index 4dc74bea3..4a95b42bf 100644
--- a/swagger/definitions/request/agent_bot/create_update_payload.yml
+++ b/swagger/definitions/request/agent_bot/create_update_payload.yml
@@ -3,9 +3,28 @@ properties:
   name:
     type: string
     description: The name of the agent bot
+    example: 'My Agent Bot'
   description:
     type: string
-    description: The description about the agent bot
+    description: The description of the agent bot
+    example: 'This is a sample agent bot'
   outgoing_url:
     type: string
     description: The webhook URL for the bot
+    example: 'https://example.com/webhook'
+  avatar:
+    type: string
+    format: binary
+    description: Send the form data with the avatar image binary or use the avatar_url
+  avatar_url:
+    type: string
+    description: The url to a jpeg, png file for the agent bot avatar
+    example: https://example.com/avatar.png
+  bot_type:
+    type: integer
+    description: The type of the bot (0 for webhook)
+    example: 0
+  bot_config:
+    type: object
+    description: The configuration for the bot
+    example: {}
diff --git a/swagger/definitions/request/automation_rule/create_update_payload.yml b/swagger/definitions/request/automation_rule/create_update_payload.yml
index 20d362e48..091fa2aaa 100644
--- a/swagger/definitions/request/automation_rule/create_update_payload.yml
+++ b/swagger/definitions/request/automation_rule/create_update_payload.yml
@@ -36,6 +36,6 @@ properties:
       example:
         attribute_key: content
         filter_operator: contains
-        query_operator: nil
+        query_operator: OR
         values:
           - help
diff --git a/swagger/definitions/request/canned_response/create_update_payload.yml b/swagger/definitions/request/canned_response/create_update_payload.yml
index ef6f7f74a..3673b4798 100644
--- a/swagger/definitions/request/canned_response/create_update_payload.yml
+++ b/swagger/definitions/request/canned_response/create_update_payload.yml
@@ -3,6 +3,8 @@ properties:
   content:
     type: string
     description: Message content for canned response
+    example: 'Hello, {{contact.name}}! Welcome to our service.'
   short_code:
     type: string
     description: Short Code for quick access of the canned response
+    example: 'welcome'
diff --git a/swagger/definitions/request/contact/create_payload.yml b/swagger/definitions/request/contact/create_payload.yml
new file mode 100644
index 000000000..7f74e501c
--- /dev/null
+++ b/swagger/definitions/request/contact/create_payload.yml
@@ -0,0 +1,44 @@
+type: object
+required:
+  - inbox_id
+properties:
+  inbox_id:
+    type: number
+    description: ID of the inbox to which the contact belongs
+    example: 1
+  name:
+    type: string
+    description: name of the contact
+    example: Alice
+  email:
+    type: string
+    description: email of the contact
+    example: alice@acme.inc
+  blocked:
+    type: boolean
+    description: whether the contact is blocked or not
+    example: false
+  phone_number:
+    type: string
+    description: phone number of the contact
+    example: '+123456789'
+  avatar:
+    type: string
+    format: binary
+    description: Send the form data with the avatar image binary or use the avatar_url
+  avatar_url:
+    type: string
+    description: The url to a jpeg, png file for the contact avatar
+    example: https://example.com/avatar.png
+  identifier:
+    type: string
+    description: A unique identifier for the contact in external system
+    example: '1234567890'
+  additional_attributes:
+    type: object
+    description: An object where you can store additional attributes for contact. example {"type":"customer", "age":30}
+    example: { 'type': 'customer', 'age': 30 }
+  custom_attributes:
+    type: object
+    description: An object where you can store custom attributes for contact. example {"type":"customer", "age":30}, this should have a valid custom attribute definition.
+    example: {}
diff --git a/swagger/definitions/request/contact/update.yml b/swagger/definitions/request/contact/update.yml
deleted file mode 100644
index 4a12672a3..000000000
--- a/swagger/definitions/request/contact/update.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-type: object
-properties:
-  name:
-    type: string
-    description: name of the contact
-  email:
-    type: string
-    description: email of the contact
-  phone_number:
-    type: string
-    description: phone number of the contact
-  avatar:
-    type: string
-    format: binary
-    description: Send the form data with the avatar image binary or use the avatar_url
-  avatar_url:
-    type: string
-    description: The url to a jpeg, png file for the contact avatar
-  identifier:
-    type: string
-    description: A unique identifier for the contact in external system
-  custom_attributes:
-    type: object
-    description: An object where you can store custom attributes for contact. example {"type":"customer", "age":30}
-
diff --git a/swagger/definitions/request/contact/create.yml b/swagger/definitions/request/contact/update_payload.yml
similarity index 53%
rename from swagger/definitions/request/contact/create.yml
rename to swagger/definitions/request/contact/update_payload.yml
index 5acbe5f94..99bec3548 100644
--- a/swagger/definitions/request/contact/create.yml
+++ b/swagger/definitions/request/contact/update_payload.yml
@@ -1,18 +1,21 @@
 type: object
-required:
-  - inbox_id
 properties:
-  inbox_id:
-    type: number
   name:
     type: string
     description: name of the contact
+    example: Alice
   email:
     type: string
     description: email of the contact
+    example: alice@acme.inc
+  blocked:
+    type: boolean
+    description: whether the contact is blocked or not
+    example: false
   phone_number:
     type: string
     description: phone number of the contact
+    example: '+123456789'
   avatar:
     type: string
     format: binary
@@ -20,9 +23,16 @@ properties:
   avatar_url:
     type: string
     description: The url to a jpeg, png file for the contact avatar
+    example: https://example.com/avatar.png
   identifier:
     type: string
     description: A unique identifier for the contact in external system
+    example: '1234567890'
+  additional_attributes:
+    type: object
+    description: An object where you can store additional attributes for contact. example {"type":"customer", "age":30}
+    example: { 'type': 'customer', 'age': 30 }
   custom_attributes:
     type: object
-    description: An object where you can store custom attributes for contact. example {"type":"customer", "age":30}
+    description: An object where you can store custom attributes for contact. example {"type":"customer", "age":30}, this should have a valid custom attribute definition.
+    example: {}
diff --git a/swagger/definitions/request/conversation/create_message.yml b/swagger/definitions/request/conversation/create_message_payload.yml
similarity index 68%
rename from swagger/definitions/request/conversation/create_message.yml
rename to swagger/definitions/request/conversation/create_message_payload.yml
index b3c9b935b..ef1a051c2 100644
--- a/swagger/definitions/request/conversation/create_message.yml
+++ b/swagger/definitions/request/conversation/create_message_payload.yml
@@ -5,20 +5,29 @@ properties:
   content:
     type: string
     description: The content of the message
+    example: 'Hello, how can I help you?'
   message_type:
     type: string
     enum: ['outgoing', 'incoming']
+    description: The type of the message
+    example: 'outgoing'
   private:
     type: boolean
     description: Flag to identify if it is a private note
+    example: false
   content_type:
     type: string
-    enum: ['text', 'input_email', 'cards', 'input_select', 'form' , 'article']
-    example: 'cards'
-    description: 'if you want to create custom message types'
+    enum: ['text', 'input_email', 'cards', 'input_select', 'form', 'article']
+    description: Content type of the message
+    example: 'text'
   content_attributes:
     type: object
-    description: attributes based on your content type
+    description: Attributes based on the content type
+    example: {}
+  campaign_id:
+    type: integer
+    description: The campaign id to which the message belongs
+    example: 1
   template_params:
     type: object
     description: The template params for the message in case of whatsapp Channel
@@ -35,8 +44,8 @@ properties:
         type: string
         description: Language of the template
         example: en_US
-      processed_params: 
+      processed_params:
         type: object
         description: The processed param values for template variables in template
-        example: 
-          1: "Chatwoot"
+        example:
+          1: 'Chatwoot'
diff --git a/swagger/definitions/request/conversation/create_payload.yml b/swagger/definitions/request/conversation/create_payload.yml
new file mode 100644
index 000000000..c0cc75c46
--- /dev/null
+++ b/swagger/definitions/request/conversation/create_payload.yml
@@ -0,0 +1,79 @@
+type: object
+required:
+  - source_id
+  - inbox_id
+properties:
+  source_id:
+    type: string
+    description: Conversation source id
+    example: '1234567890'
+  inbox_id:
+    type: integer
+    description: 'Id of inbox in which the conversation is created <br/> Allowed Inbox Types: Website, Phone, Api, Email'
+    example: 1
+  contact_id:
+    type: integer
+    description: Contact Id for which conversation is created
+    example: 1
+  additional_attributes:
+    type: object
+    description: Lets you specify attributes like browser information
+    example:
+      {
+        browser: 'Chrome',
+        browser_version: '89.0.4389.82',
+        os: 'Windows',
+        os_version: '10',
+      }
+  custom_attributes:
+    type: object
+    description: The object to save custom attributes for conversation, accepts custom attributes key and value
+    example: { attribute_key: attribute_value, priority_conversation_number: 3 }
+  status:
+    type: string
+    enum: ['open', 'resolved', 'pending']
+    description: Specify the conversation whether it's pending, open, closed
+    example: open
+  assignee_id:
+    type: integer
+    description: Agent Id for assigning a conversation to an agent
+    example: 1
+  team_id:
+    type: integer
+    description: Team Id for assigning a conversation to a team\
+    example: 1
+  snoozed_until:
+    type: string
+    format: date-time
+    description: Snoozed until date time
+    example: '2030-07-21T17:32:28Z'
+  message:
+    type: object
+    description: The initial message to be sent to the conversation
+    required: ['content']
+    properties:
+      content:
+        type: string
+        description: The content of the message
+        example: 'Hello, how can I help you?'
+      template_params:
+        type: object
+        description: The template params for the message in case of whatsapp Channel
+        properties:
+          name:
+            type: string
+            description: Name of the template
+            example: 'sample_issue_resolution'
+          category:
+            type: string
+            description: Category of the template
+            example: UTILITY
+          language:
+            type: string
+            description: Language of the template
+            example: en_US
+          processed_params:
+            type: object
+            description: The processed param values for template variables in template
+            example:
+              1: 'Chatwoot'
diff --git a/swagger/definitions/request/custom_attribute/create_update_payload.yml b/swagger/definitions/request/custom_attribute/create_update_payload.yml
index fd368f98c..3ee960559 100644
--- a/swagger/definitions/request/custom_attribute/create_update_payload.yml
+++ b/swagger/definitions/request/custom_attribute/create_update_payload.yml
@@ -3,20 +3,34 @@ properties:
   attribute_display_name:
     type: string
     description: Attribute display name
+    example: 'Custom Attribute'
   attribute_display_type:
     type: integer
     description: Attribute display type (text- 0, number- 1, currency- 2, percent- 3, link- 4, date- 5, list- 6, checkbox- 7)
+    example: 0
   attribute_description:
     type: string
     description: Attribute description
+    example: 'This is a custom attribute'
   attribute_key:
     type: string
     description: Attribute unique key value
+    example: 'custom_attribute'
   attribute_values:
     type: array
     description: Attribute values
     items:
       type: string
+    example: ['value1', 'value2']
   attribute_model:
     type: integer
     description: Attribute type(conversation_attribute- 0, contact_attribute- 1)
+    example: 0
+  regex_pattern:
+    type: string
+    description: Regex pattern (Only applicable for type- text). The regex pattern is used to validate the attribute value(s).
+    example: '^[a-zA-Z0-9]+$'
+  regex_cue:
+    type: string
+    description: Regex cue message (Only applicable for type- text). The cue message is shown when the regex pattern is not matched.
+    example: 'Please enter a valid value'
diff --git a/swagger/definitions/request/custom_filter/create_update_payload.yml b/swagger/definitions/request/custom_filter/create_update_payload.yml
index 86a6cd8c1..c046f74df 100644
--- a/swagger/definitions/request/custom_filter/create_update_payload.yml
+++ b/swagger/definitions/request/custom_filter/create_update_payload.yml
@@ -3,10 +3,13 @@ properties:
   name:
     type: string
     description: The name of the custom filter
+    example: 'My Custom Filter'
   type:
     type: string
-    enum: ["conversation", "contact", "report"]
+    enum: ['conversation', 'contact', 'report']
     description: The description about the custom filter
+    example: 'conversation'
   query:
     type: object
     description: A query that needs to be saved as a custom filter
+    example: {}
diff --git a/swagger/definitions/request/inbox/create_payload.yml b/swagger/definitions/request/inbox/create_payload.yml
new file mode 100644
index 000000000..59584054c
--- /dev/null
+++ b/swagger/definitions/request/inbox/create_payload.yml
@@ -0,0 +1,88 @@
+type: object
+properties:
+  name:
+    type: string
+    description: The name of the inbox
+    example: 'Support'
+  avatar:
+    type: string
+    format: binary
+    description: Image file for avatar
+  greeting_enabled:
+    type: boolean
+    description: Enable greeting message
+    example: true
+  greeting_message:
+    type: string
+    description: Greeting message to be displayed on the widget
+    example: Hello, how can I help you?
+  enable_email_collect:
+    type: boolean
+    description: Enable email collection
+    example: true
+  csat_survey_enabled:
+    type: boolean
+    description: Enable CSAT survey
+    example: true
+  enable_auto_assignment:
+    type: boolean
+    description: Enable Auto Assignment
+    example: true
+  working_hours_enabled:
+    type: boolean
+    description: Enable working hours
+    example: true
+  out_of_office_message:
+    type: string
+    description: Out of office message to be displayed on the widget
+    example: We are currently out of office. Please leave a message and we will get back to you.
+  timezone:
+    type: string
+    description: Timezone of the inbox
+    example: 'America/New_York'
+  allow_messages_after_resolved:
+    type: boolean
+    description: Allow messages after conversation is resolved
+    example: true
+  lock_to_single_conversation:
+    type: boolean
+    description: Lock to single conversation
+    example: true
+  portal_id:
+    type: integer
+    description: Id of the help center portal to attach to the inbox
+    example: 1
+  sender_name_type:
+    type: string
+    description: Sender name type for the inbox
+    enum: ['friendly', 'professional']
+    example: 'friendly'
+  business_name:
+    type: string
+    description: Business name for the inbox
+    example: 'My Business'
+  channel:
+    type: object
+    properties:
+      type:
+        type: string
+        description: Type of the channel
+        enum:
+          ['web_widget', 'api', 'email', 'line', 'telegram', 'whatsapp', 'sms']
+        example: web_widget
+      website_url:
+        type: string
+        description: URL at which the widget will be loaded
+        example: 'https://example.com'
+      welcome_title:
+        type: string
+        description: Welcome title to be displayed on the widget
+        example: 'Welcome to our support'
+      welcome_tagline:
+        type: string
+        description: Welcome tagline to be displayed on the widget
+        example: 'We are here to help you'
+      widget_color:
+        type: string
+        description: A Hex-color string used to customize the widget
+        example: '#FF5733'
diff --git a/swagger/definitions/request/inbox/update_payload.yml b/swagger/definitions/request/inbox/update_payload.yml
new file mode 100644
index 000000000..f625fc5b8
--- /dev/null
+++ b/swagger/definitions/request/inbox/update_payload.yml
@@ -0,0 +1,82 @@
+type: object
+properties:
+  name:
+    type: string
+    description: The name of the inbox
+    example: 'Support'
+  avatar:
+    type: string
+    format: binary
+    description: Image file for avatar
+  greeting_enabled:
+    type: boolean
+    description: Enable greeting message
+    example: true
+  greeting_message:
+    type: string
+    description: Greeting message to be displayed on the widget
+    example: Hello, how can I help you?
+  enable_email_collect:
+    type: boolean
+    description: Enable email collection
+    example: true
+  csat_survey_enabled:
+    type: boolean
+    description: Enable CSAT survey
+    example: true
+  enable_auto_assignment:
+    type: boolean
+    description: Enable Auto Assignment
+    example: true
+  working_hours_enabled:
+    type: boolean
+    description: Enable working hours
+    example: true
+  out_of_office_message:
+    type: string
+    description: Out of office message to be displayed on the widget
+    example: We are currently out of office. Please leave a message and we will get back to you.
+  timezone:
+    type: string
+    description: Timezone of the inbox
+    example: 'America/New_York'
+  allow_messages_after_resolved:
+    type: boolean
+    description: Allow messages after conversation is resolved
+    example: true
+  lock_to_single_conversation:
+    type: boolean
+    description: Lock to single conversation
+    example: true
+  portal_id:
+    type: integer
+    description: Id of the help center portal to attach to the inbox
+    example: 1
+  sender_name_type:
+    type: string
+    description: Sender name type for the inbox
+    enum: ['friendly', 'professional']
+    example: 'friendly'
+  business_name:
+    type: string
+    description: Business name for the inbox
+    example: 'My Business'
+  channel:
+    type: object
+    properties:
+      website_url:
+        type: string
+        description: URL at which the widget will be loaded
+        example: 'https://example.com'
+      welcome_title:
+        type: string
+        description: Welcome title to be displayed on the widget
+        example: 'Welcome to our support'
+      welcome_tagline:
+        type: string
+        description: Welcome tagline to be displayed on the widget
+        example: 'We are here to help you'
+      widget_color:
+        type: string
+        description: A Hex-color string used to customize the widget
+        example: '#FF5733'
diff --git a/swagger/definitions/request/integrations/hook_create_payload.yml b/swagger/definitions/request/integrations/hook_create_payload.yml
index d1bf518d8..71da8106b 100644
--- a/swagger/definitions/request/integrations/hook_create_payload.yml
+++ b/swagger/definitions/request/integrations/hook_create_payload.yml
@@ -1,11 +1,18 @@
 type: object
 properties:
   app_id:
-    type: string
+    type: integer
     description: The ID of app for which integration hook is being created
+    example: 1
   inbox_id:
-    type: string
+    type: integer
     description: The inbox ID, if the hook is an inbox hook
+    example: 1
+  status:
+    type: integer
+    description: The status of the integration (0 for inactive, 1 for active)
+    example: 1
   settings:
     type: object
     description: The settings required by the integration
+    example: {}
diff --git a/swagger/definitions/request/integrations/hook_update_payload.yml b/swagger/definitions/request/integrations/hook_update_payload.yml
index 5b91024db..4444dee81 100644
--- a/swagger/definitions/request/integrations/hook_update_payload.yml
+++ b/swagger/definitions/request/integrations/hook_update_payload.yml
@@ -1,5 +1,10 @@
 type: object
 properties:
+  status:
+    type: integer
+    description: The status of the integration (0 for inactive, 1 for active)
+    example: 1
   settings:
     type: object
     description: The settings required by the integration
+    example: {}
diff --git a/swagger/definitions/request/platform/agent_bot/create_update_payload.yml b/swagger/definitions/request/platform/agent_bot/create_update_payload.yml
new file mode 100644
index 000000000..a258e28a6
--- /dev/null
+++ b/swagger/definitions/request/platform/agent_bot/create_update_payload.yml
@@ -0,0 +1,26 @@
+type: object
+properties:
+  name:
+    type: string
+    description: The name of the agent bot
+    example: 'My Agent Bot'
+  description:
+    type: string
+    description: The description of the agent bot
+    example: 'This is a sample agent bot'
+  outgoing_url:
+    type: string
+    description: The webhook URL for the bot
+    example: 'https://example.com/webhook'
+  account_id:
+    type: integer
+    description: The account ID to associate the agent bot with
+    example: 1
+  avatar:
+    type: string
+    format: binary
+    description: Send the form data with the avatar image binary or use the avatar_url
+  avatar_url:
+    type: string
+    description: The url to a jpeg, png file for the agent bot avatar
+    example: https://example.com/avatar.png
diff --git a/swagger/definitions/request/portal/article_create_update_payload.yml b/swagger/definitions/request/portal/article_create_update_payload.yml
index cddac1d1d..311d478c3 100644
--- a/swagger/definitions/request/portal/article_create_update_payload.yml
+++ b/swagger/definitions/request/portal/article_create_update_payload.yml
@@ -1,34 +1,51 @@
 type: object
 properties:
-  content:
+  title:
     type: string
-    description: The text content.
-  meta:
-    type: object
-    description: Use for search
-    example: { tags: ['article_name'],  title: 'article title', description: 'article description' }
+    description: The title of the article
+    example: 'Article Title'
+  slug:
+    type: string
+    description: The slug of the article
+    example: 'article-title'
   position:
     type: integer
     description: article position in category
-  status:
-    type: integer
-    example: ['draft', 'published', 'archived']
-  title:
+    example: 1
+  content:
     type: string
-  slug:
+    description: The text content.
+    example: 'This is the content of the article'
+  description:
     type: string
-  views:
-    type: integer
-  portal_id:
-    type: integer
-  account_id:
-    type: integer
-  author_id:
-    type: integer
+    description: The description of the article
+    example: 'This is the description of the article'
   category_id:
     type: integer
-  folder_id:
+    description: The category id of the article
+    example: 1
+  author_id:
     type: integer
+    description: The author agent id of the article
+    example: 1
   associated_article_id:
     type: integer
     description: To associate similar articles to each other, e.g to provide the link for the reference.
+    example: 2
+  status:
+    type: integer
+    description: The status of the article. 0 for draft, 1 for published, 2 for archived
+    example: 1
+  locale:
+    type: string
+    description: The locale of the article
+    example: 'en'
+  meta:
+    type: object
+    description: Use for search
+    example:
+      {
+        tags: ['article_name'],
+        title: 'article title',
+        description: 'article description',
+      }
diff --git a/swagger/definitions/request/portal/category_create_update_payload.yml b/swagger/definitions/request/portal/category_create_update_payload.yml
index 0d1ce5c8f..67bb650cb 100644
--- a/swagger/definitions/request/portal/category_create_update_payload.yml
+++ b/swagger/definitions/request/portal/category_create_update_payload.yml
@@ -1,28 +1,34 @@
 type: object
 properties:
-  description:
-    type: string
-    description: Category description
-  locale:
-    type: string
-    description: Category locale
-    example: en/es
   name:
     type: string
-    description: Category name
-  slug:
+    description: The name of the category
+    example: 'Category Name'
+  description:
     type: string
-    description: Category slug
+    description: A description for the category
+    example: 'Category description'
   position:
     type: integer
     description: Category position in the portal list to sort
-  portal_id:
-    type: integer
-  account_id:
-    type: integer
-  associated_category_id:
-    type: integer
-    description: To associate similar categories to each other, e.g same category of product documentation in different languages
+    example: 1
+  slug:
+    type: string
+    description: The category slug used in the URL
+    example: 'category-name'
+  locale:
+    type: string
+    description: The locale of the category
+    example: en
+  icon:
+    type: string
+    description: The icon of the category as a string (emoji)
+    example: '📚'
   parent_category_id:
     type: integer
     description: To define parent category, e.g product documentation has multiple level features in sales category or in engineering category.
+    example: 1
+  associated_category_id:
+    type: integer
+    description: To associate similar categories to each other, e.g same category of product documentation in different languages
+    example: 2
diff --git a/swagger/definitions/request/portal/portal_create_update_payload.yml b/swagger/definitions/request/portal/portal_create_update_payload.yml
index d1e82aaf4..56feadbda 100644
--- a/swagger/definitions/request/portal/portal_create_update_payload.yml
+++ b/swagger/definitions/request/portal/portal_create_update_payload.yml
@@ -1,20 +1,13 @@
 type: object
 properties:
-  archived:
-    type: boolean
-    description: Status to check if portal is live
   color:
     type: string
-    description: Header color for help-center
-    example: add color HEX string, "#fffff"
-  config:
-    type: object
-    description: Configuration about supporting locales
-    example: { allowed_locales: ['en', 'es'], default_locale: 'en' }
+    description: Header color for help-center in hex format
+    example: '#FFFFFF'
   custom_domain:
     type: string
-    description: Custom domain to  display help center.
-    example: https://chatwoot.help/.
+    description: Custom domain to display help center.
+    example: chatwoot.help
   header_text:
     type: string
     description: Help center header
@@ -26,11 +19,20 @@ properties:
   name:
     type: string
     description: Name for the portal
-  slug:
-    type: string
-    description: Slug for the portal to display in link
+    example: Handbook
   page_title:
     type: string
     description: Page title for the portal
-  account_id:
-    type: integer
+    example: Handbook
+  slug:
+    type: string
+    description: Slug for the portal to display in link
+    example: handbook
+  archived:
+    type: boolean
+    description: Status to check if portal is live
+    example: false
+  config:
+    type: object
+    description: Configuration about supporting locales
+    example: { allowed_locales: ['en', 'es'], default_locale: 'en' }
diff --git a/swagger/definitions/request/public/contact/create_update_payload.yml b/swagger/definitions/request/public/contact/create_update_payload.yml
index 48c6e4550..f4cacafe8 100644
--- a/swagger/definitions/request/public/contact/create_update_payload.yml
+++ b/swagger/definitions/request/public/contact/create_update_payload.yml
@@ -1,24 +1,30 @@
-
 type: object
 properties:
   identifier:
     type: string
     description: External identifier of the contact
+    example: '1234567890'
   identifier_hash:
     type: string
     description: Identifier hash prepared for HMAC authentication
+    example: 'e93275d4eba0e5679ad55f5360af00444e2a888df9b0afa3e8b691c3173725f9'
   email:
     type: string
     description: Email of the contact
+    example: alice@acme.inc
   name:
     type: string
     description: Name of the contact
+    example: Alice
   phone_number:
     type: string
     description: Phone number of the contact
-  avatar_url:
+    example: '+123456789'
+  avatar:
     type: string
-    description: The url to a jpeg, png file for the user avatar
+    format: binary
+    description: Send the form data with the avatar image binary or use the avatar_url
   custom_attributes:
     type: object
-    description: Custom attributes of the customer
\ No newline at end of file
+    description: Custom attributes of the customer
+    example: {}
diff --git a/swagger/definitions/request/public/conversation/create_payload.yml b/swagger/definitions/request/public/conversation/create_payload.yml
index 37cd9f7ef..e81d1adf5 100644
--- a/swagger/definitions/request/public/conversation/create_payload.yml
+++ b/swagger/definitions/request/public/conversation/create_payload.yml
@@ -3,3 +3,4 @@ properties:
   custom_attributes:
     type: object
     description: Custom attributes of the conversation
+    example: {}
diff --git a/swagger/definitions/request/public/message/create_payload.yml b/swagger/definitions/request/public/message/create_payload.yml
index 2935b4abb..6ae920255 100644
--- a/swagger/definitions/request/public/message/create_payload.yml
+++ b/swagger/definitions/request/public/message/create_payload.yml
@@ -1,10 +1,10 @@
-
 type: object
 properties:
   content:
     type: string
     description: Content for the message
+    example: 'Hello, how can I help you?'
   echo_id:
     type: string
     description: Temporary identifier which will be passed back via websockets
-  
\ No newline at end of file
+    example: '1234567890'
diff --git a/swagger/definitions/request/public/message/update_payload.yml b/swagger/definitions/request/public/message/update_payload.yml
index 10926faa1..c739aa34a 100644
--- a/swagger/definitions/request/public/message/update_payload.yml
+++ b/swagger/definitions/request/public/message/update_payload.yml
@@ -1,6 +1,30 @@
-
 type: object
 properties:
   submitted_values:
     type: object
-    description: Replies to the Bot Message Types
\ No newline at end of file
+    description: Replies to the Bot Message Types
+    properties:
+      name:
+        type: string
+        description: The name of the submiitted value
+        example: 'My Name'
+      title:
+        type: string
+        description: The title of the submitted value
+        example: 'My Title'
+      value:
+        type: string
+        description: The value of the submitted value
+        example: 'value'
+      csat_survey_response:
+        type: object
+        description: The CSAT survey response
+        properties:
+          feedback_message:
+            type: string
+            description: The feedback message of the CSAT survey response
+            example: 'Great service!'
+          rating:
+            type: integer
+            description: The rating of the CSAT survey response
+            example: 5
diff --git a/swagger/definitions/request/team/create_update_payload.yml b/swagger/definitions/request/team/create_update_payload.yml
index f4db1e5d7..77b714269 100644
--- a/swagger/definitions/request/team/create_update_payload.yml
+++ b/swagger/definitions/request/team/create_update_payload.yml
@@ -3,9 +3,12 @@ properties:
   name:
     type: string
     description: The name of the team
+    example: Support Team
   description:
     type: string
     description: The description of the team
+    example: This is a team of support agents
   allow_auto_assign:
     type: boolean
     description: If this setting is turned on, the system would automatically assign the conversation to an agent in the team while assigning the conversation to a team
+    example: true
diff --git a/swagger/definitions/request/user/create_update_payload.yml b/swagger/definitions/request/user/create_update_payload.yml
index e14a25317..1bebdc59c 100644
--- a/swagger/definitions/request/user/create_update_payload.yml
+++ b/swagger/definitions/request/user/create_update_payload.yml
@@ -3,13 +3,20 @@ properties:
   name:
     type: string
     description: Name of the user
+    example: 'Daniel'
+  display_name:
+    type: string
+    description: Display name of the user
+    example: 'Dan'
   email:
     type: string
     description: Email of the user
+    example: 'daniel@acme.inc'
   password:
     type: string
     description: Password must contain uppercase, lowercase letters, number and a special character
+    example: 'Password2!'
   custom_attributes:
     type: object
     description: Custom attributes you want to associate with the user
-
+    example: {}
diff --git a/swagger/definitions/request/webhooks/create_update_payload.yml b/swagger/definitions/request/webhooks/create_update_payload.yml
index 417843fe6..2f4a718e4 100644
--- a/swagger/definitions/request/webhooks/create_update_payload.yml
+++ b/swagger/definitions/request/webhooks/create_update_payload.yml
@@ -3,16 +3,23 @@ properties:
   url:
     type: string
     description: The url where the events should be sent
+    example: https://example.com/webhook
   subscriptions:
     type: array
     items:
       type: string
-      enum: [
-        "conversation_created",
-        "conversation_status_changed",
-        "conversation_updated",
-        "message_created",
-        "message_updated",
-        "webwidget_triggered"
-      ]
+      enum:
+        [
+          'conversation_created',
+          'conversation_status_changed',
+          'conversation_updated',
+          'message_created',
+          'message_updated',
+          'contact_created',
+          'contact_updated',
+          'webwidget_triggered',
+        ]
     description: The events you want to subscribe to.
+    example:
+      - conversation_created
+      - conversation_status_changed
diff --git a/swagger/definitions/resource/account_user.yml b/swagger/definitions/resource/account_user.yml
new file mode 100644
index 000000000..cfc530383
--- /dev/null
+++ b/swagger/definitions/resource/account_user.yml
@@ -0,0 +1,14 @@
+type: array
+description: 'Array of account users'
+items:
+  type: object
+  properties:
+    account_id:
+      type: integer
+      description: The ID of the account
+    user_id:
+      type: integer
+      description: The ID of the user
+    role:
+      type: string
+      description: whether user is an administrator or agent
diff --git a/swagger/definitions/resource/agent.yml b/swagger/definitions/resource/agent.yml
index e3d506a3b..dd1379b50 100644
--- a/swagger/definitions/resource/agent.yml
+++ b/swagger/definitions/resource/agent.yml
@@ -19,14 +19,13 @@ properties:
     enum: ['agent', 'administrator']
   confirmed:
     type: boolean
-  availability_status: 
+  availability_status:
     type: string
     enum: ['available', 'busy', 'offline']
     description: The availability status of the agent computed by Chatwoot.
   auto_offline:
     type: boolean
     description: Whether the availability status of agent is configured to go offline automatically when away.
-  custom_attributes: 
+  custom_attributes:
     type: object
     description: Available for users who are created through platform APIs and has custom attributes associated.
-
diff --git a/swagger/definitions/resource/contact.yml b/swagger/definitions/resource/contact.yml
index bbb82e14c..57d5f98af 100644
--- a/swagger/definitions/resource/contact.yml
+++ b/swagger/definitions/resource/contact.yml
@@ -24,8 +24,9 @@ properties:
           custom_attributes:
             type: object
             description: The object to save custom attributes for contact, accepts custom attributes key and value
-            example: { attribute_key: attribute_value, signed_up_at: dd/mm/yyyy }
+            example:
+              { attribute_key: attribute_value, signed_up_at: dd/mm/yyyy }
           contact_inboxes:
             type: array
             items:
-              $ref: '#/definitions/contact_inboxes'
+              $ref: '#/components/schemas/contact_inboxes'
diff --git a/swagger/definitions/resource/contact_inboxes.yml b/swagger/definitions/resource/contact_inboxes.yml
index a223490ff..7ccba61b1 100644
--- a/swagger/definitions/resource/contact_inboxes.yml
+++ b/swagger/definitions/resource/contact_inboxes.yml
@@ -5,4 +5,4 @@ properties:
     description: Contact Inbox Source Id
   inbox:
     type: object
-    $ref: '#/definitions/inbox'
+    $ref: '#/components/schemas/inbox'
diff --git a/swagger/definitions/resource/contactable_inboxes.yml b/swagger/definitions/resource/contactable_inboxes.yml
index a223490ff..7ccba61b1 100644
--- a/swagger/definitions/resource/contactable_inboxes.yml
+++ b/swagger/definitions/resource/contactable_inboxes.yml
@@ -5,4 +5,4 @@ properties:
     description: Contact Inbox Source Id
   inbox:
     type: object
-    $ref: '#/definitions/inbox'
+    $ref: '#/components/schemas/inbox'
diff --git a/swagger/definitions/resource/conversation.yml b/swagger/definitions/resource/conversation.yml
index 085d21879..0a16f0134 100644
--- a/swagger/definitions/resource/conversation.yml
+++ b/swagger/definitions/resource/conversation.yml
@@ -6,7 +6,7 @@ properties:
   messages:
     type: array
     items:
-      $ref: '#/definitions/message'
+      $ref: '#/components/schemas/message'
   account_id:
     type: number
     description: Account Id
diff --git a/swagger/definitions/resource/extension/contact/conversation.yml b/swagger/definitions/resource/extension/contact/conversation.yml
index 6e6576f80..19936e7e8 100644
--- a/swagger/definitions/resource/extension/contact/conversation.yml
+++ b/swagger/definitions/resource/extension/contact/conversation.yml
@@ -19,4 +19,4 @@ properties:
             type: string
             description: Channel Type
       assignee:
-        $ref: '#/definitions/user'
+        $ref: '#/components/schemas/user'
diff --git a/swagger/definitions/resource/extension/conversation/list.yml b/swagger/definitions/resource/extension/conversation/list.yml
index 426902d4f..39e04baa0 100644
--- a/swagger/definitions/resource/extension/conversation/list.yml
+++ b/swagger/definitions/resource/extension/conversation/list.yml
@@ -19,6 +19,6 @@ properties:
         description: 'array of conversations'
         items:
           allOf:
-            - $ref: '#/definitions/generic_id'
-            - $ref: '#/definitions/conversation'
+            - $ref: '#/components/schemas/generic_id'
+            - $ref: '#/components/schemas/conversation'
             - $ref: '../contact/conversation.yml'
diff --git a/swagger/definitions/resource/extension/conversation/show.yml b/swagger/definitions/resource/extension/conversation/show.yml
index fb697ad38..27a27018b 100644
--- a/swagger/definitions/resource/extension/conversation/show.yml
+++ b/swagger/definitions/resource/extension/conversation/show.yml
@@ -1,4 +1,4 @@
 type: object
 allOf:
-  - $ref: '#/definitions/conversation'
+  - $ref: '#/components/schemas/conversation'
   - $ref: '../contact/conversation.yml'
diff --git a/swagger/definitions/resource/portal.yml b/swagger/definitions/resource/portal.yml
index a1bef33bc..5fb13e9b8 100644
--- a/swagger/definitions/resource/portal.yml
+++ b/swagger/definitions/resource/portal.yml
@@ -27,8 +27,8 @@ properties:
   categories:
     type: array
     items:
-      $ref: '#/definitions/category'
+      $ref: '#/components/schemas/category'
   articles:
     type: array
     items:
-      $ref: '#/definitions/article'
+      $ref: '#/components/schemas/article'
diff --git a/swagger/definitions/resource/public/contact.yml b/swagger/definitions/resource/public/contact.yml
index ae2eae8d3..453ac5c97 100644
--- a/swagger/definitions/resource/public/contact.yml
+++ b/swagger/definitions/resource/public/contact.yml
@@ -1,5 +1,5 @@
 type: object
-properties: 
+properties:
   id:
     type: integer
     description: Id of the contact
@@ -14,4 +14,4 @@ properties:
     description: Email of the contact
   pubsub_token:
     type: string
-    description: The token to be used to connect to chatwoot websocket
\ No newline at end of file
+    description: The token to be used to connect to chatwoot websocket
diff --git a/swagger/definitions/resource/public/conversation.yml b/swagger/definitions/resource/public/conversation.yml
index a2f797e1b..67febca2d 100644
--- a/swagger/definitions/resource/public/conversation.yml
+++ b/swagger/definitions/resource/public/conversation.yml
@@ -9,7 +9,7 @@ properties:
   messages:
     type: array
     items:
-      $ref: '#/definitions/message'
+      $ref: '#/components/schemas/message'
     description: Messages in the conversation
   contact:
     type: object
diff --git a/swagger/definitions/resource/user.yml b/swagger/definitions/resource/user.yml
index c06cbab8e..b788713ad 100644
--- a/swagger/definitions/resource/user.yml
+++ b/swagger/definitions/resource/user.yml
@@ -19,10 +19,10 @@ properties:
     enum: ['agent', 'administrator']
   confirmed:
     type: boolean
-  custom_attributes: 
+  custom_attributes:
     type: object
     description: Available for users who are created through platform APIs and has custom attributes associated.
   accounts:
     type: array
     items:
-      $ref: '#/definitions/account'
+      $ref: '#/components/schemas/account'
diff --git a/swagger/index.yml b/swagger/index.yml
index 41f78dbc4..f0a97f0a6 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -1,47 +1,39 @@
-swagger: "2.0"
+openapi: '3.0.4'
 info:
-  description: This is the API documentation for Chatwoot server.
-  version: 1.0.0
   title: Chatwoot
-  termsOfService:	https://www.chatwoot.com/terms-of-service/
+  description: This is the API documentation for Chatwoot server.
+  version: 1.1.0
+  termsOfService: https://www.chatwoot.com/terms-of-service/
   contact:
     email: hello@chatwoot.com
   license:
     name: MIT License
     url: https://opensource.org/licenses/MIT
-host: app.chatwoot.com
-basePath: /
-schemes:
-  - https
-produces:
-- application/json; charset=utf-8
-consumes:
-- application/json; charset=utf-8
-securityDefinitions:
-  userApiKey:
-    type: apiKey
-    in: header
-    name: api_access_token
-    description: This token can be obtained by visiting the profile page or via rails console. Provides access to  endpoints based on the user permissions levels. This token can be saved by an external system when user is created via API, to perform activities on behalf of the user.
-  agentBotApiKey:
-    type: apiKey
-    in: header
-    name: api_access_token
-    description: This token should be provided by system admin or obtained via rails console. This token can be used to build bot integrations and can only access limited apis.
-  platformAppApiKey:
-    type: apiKey
-    in: header
-    name: api_access_token
-    description: This token can be obtained by the system admin after creating a platformApp. This token should be used to provision agent bots, accounts, users and their roles.
-security:
-  - userApiKey: []
-
+servers:
+  - url: https://app.chatwoot.com/
 paths:
   $ref: ./paths/index.yml
-definitions:
-  $ref: ./definitions/index.yml
-parameters:
-  $ref: ./parameters/index.yml
+components:
+  schemas:
+    $ref: ./definitions/index.yml
+  parameters:
+    $ref: ./parameters/index.yml
+  securitySchemes:
+    userApiKey:
+      type: apiKey
+      in: header
+      name: api_access_token
+      description: This token can be obtained by visiting the profile page or via rails console. Provides access to  endpoints based on the user permissions levels. This token can be saved by an external system when user is created via API, to perform activities on behalf of the user.
+    agentBotApiKey:
+      type: apiKey
+      in: header
+      name: api_access_token
+      description: This token should be provided by system admin or obtained via rails console. This token can be used to build bot integrations and can only access limited apis.
+    platformAppApiKey:
+      type: apiKey
+      in: header
+      name: api_access_token
+      description: This token can be obtained by the system admin after creating a platformApp. This token should be used to provision agent bots, accounts, users and their roles.
 
 x-tagGroups:
   - name: Platform
@@ -56,9 +48,6 @@ x-tagGroups:
       - Agents
       - Canned Responses
       - Contacts
-      - Contact Labels
-      - Conversation Assignment
-      - Conversation Labels
       - Conversations
       - Custom Attributes
       - Custom Filters
diff --git a/swagger/parameters/account_id.yml b/swagger/parameters/account_id.yml
index aa3d48a8a..133155c21 100644
--- a/swagger/parameters/account_id.yml
+++ b/swagger/parameters/account_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: account_id
-type: integer
+schema:
+  type: integer
 required: true
 description: The numeric ID of the account
diff --git a/swagger/parameters/agent_bot_id.yml b/swagger/parameters/agent_bot_id.yml
index 6c94ef5dc..4d1479cb4 100644
--- a/swagger/parameters/agent_bot_id.yml
+++ b/swagger/parameters/agent_bot_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: id
-type: integer
+schema:
+  type: integer
 required: true
 description: The ID of the agentbot to be updated
diff --git a/swagger/parameters/contact_sort.yml b/swagger/parameters/contact_sort.yml
index 6f3da0b1b..f25d07760 100644
--- a/swagger/parameters/contact_sort.yml
+++ b/swagger/parameters/contact_sort.yml
@@ -1,14 +1,15 @@
 in: query
 name: sort
-type: string
-enum:
-  - name
-  - email
-  - phone_number
-  - last_activity_at
-  - -name
-  - -email
-  - -phone_number
-  - -last_activity_at
+schema:
+  type: string
+  enum:
+    - name
+    - email
+    - phone_number
+    - last_activity_at
+    - -name
+    - -email
+    - -phone_number
+    - -last_activity_at
 required: false
 description: The attribute by which list should be sorted
diff --git a/swagger/parameters/conversation_id.yml b/swagger/parameters/conversation_id.yml
index d8de755fe..4f4cb19ab 100644
--- a/swagger/parameters/conversation_id.yml
+++ b/swagger/parameters/conversation_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: conversation_id
-type: integer
+schema:
+  type: integer
 required: true
 description: The numeric ID of the conversation
diff --git a/swagger/parameters/conversation_uuid.yml b/swagger/parameters/conversation_uuid.yml
index b2bff7f39..c585ddc09 100644
--- a/swagger/parameters/conversation_uuid.yml
+++ b/swagger/parameters/conversation_uuid.yml
@@ -1,5 +1,6 @@
 in: path
 name: conversation_uuid
-type: integer
+schema:
+  type: integer
 required: true
 description: The uuid of the conversation
diff --git a/swagger/parameters/custom_filter_id.yml b/swagger/parameters/custom_filter_id.yml
index b19f52f8e..46776511f 100644
--- a/swagger/parameters/custom_filter_id.yml
+++ b/swagger/parameters/custom_filter_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: custom_filter_id
-type: integer
+schema:
+  type: integer
 required: true
 description: The numeric ID of the custom filter
diff --git a/swagger/parameters/hook_id.yml b/swagger/parameters/hook_id.yml
index c1600def4..f1c50c3d4 100644
--- a/swagger/parameters/hook_id.yml
+++ b/swagger/parameters/hook_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: hook_id
-type: integer
+schema:
+  type: integer
 required: true
 description: The numeric ID of the integration hook
diff --git a/swagger/parameters/inbox_id.yml b/swagger/parameters/inbox_id.yml
index 716d34de6..58640fb08 100644
--- a/swagger/parameters/inbox_id.yml
+++ b/swagger/parameters/inbox_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: inbox_id
-type: integer
+schema:
+  type: integer
 required: true
 description: The ID of the Inbox
diff --git a/swagger/parameters/message_id.yml b/swagger/parameters/message_id.yml
index 3fc6edfcf..3064a31e2 100644
--- a/swagger/parameters/message_id.yml
+++ b/swagger/parameters/message_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: message_id
-type: integer
+schema:
+  type: integer
 required: true
 description: The numeric ID of the message
diff --git a/swagger/parameters/page.yml b/swagger/parameters/page.yml
index 8cdc77b1e..3ef0f55b6 100644
--- a/swagger/parameters/page.yml
+++ b/swagger/parameters/page.yml
@@ -1,6 +1,7 @@
 in: query
 name: page
-type: integer
-default: 1
+schema:
+  type: integer
+  default: 1
 required: false
 description: The page parameter
diff --git a/swagger/parameters/platform_user_id.yml b/swagger/parameters/platform_user_id.yml
index d31f71878..708a0aad9 100644
--- a/swagger/parameters/platform_user_id.yml
+++ b/swagger/parameters/platform_user_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: id
-type: integer
+schema:
+  type: integer
 required: true
 description: The numeric ID of the user on the platform
diff --git a/swagger/parameters/portal_id.yml b/swagger/parameters/portal_id.yml
index b45f69629..dcd1f8b32 100644
--- a/swagger/parameters/portal_id.yml
+++ b/swagger/parameters/portal_id.yml
@@ -1,5 +1,6 @@
 in: path
-name: portal_id
-type: integer
+name: id
+schema:
+  type: string
 required: true
-description: The numeric ID of the portal
+description: The slug identifier of the portal
diff --git a/swagger/parameters/public/contact_identifier.yml b/swagger/parameters/public/contact_identifier.yml
index 6bb522c6b..3dd2d28c2 100644
--- a/swagger/parameters/public/contact_identifier.yml
+++ b/swagger/parameters/public/contact_identifier.yml
@@ -1,5 +1,6 @@
 in: path
 name: contact_identifier
-type: string
+schema:
+  type: string
 required: true
 description: The source id of contact obtained on contact create
diff --git a/swagger/parameters/public/inbox_identifier.yml b/swagger/parameters/public/inbox_identifier.yml
index 091c0d73e..35e33e6c2 100644
--- a/swagger/parameters/public/inbox_identifier.yml
+++ b/swagger/parameters/public/inbox_identifier.yml
@@ -1,5 +1,6 @@
 in: path
 name: inbox_identifier
-type: string
+schema:
+  type: string
 required: true
 description: The identifier obtained from API inbox channel
diff --git a/swagger/parameters/report_metric.yml b/swagger/parameters/report_metric.yml
index 552b0d310..c4bb6cc76 100644
--- a/swagger/parameters/report_metric.yml
+++ b/swagger/parameters/report_metric.yml
@@ -1,12 +1,13 @@
 in: query
 name: metric
-type: string
-enum:
-  - conversations_count
-  - incoming_messages_count
-  - outgoing_messages_count
-  - avg_first_response_time
-  - avg_resolution_time
-  - resolutions_count
+schema:
+  type: string
+  enum:
+    - conversations_count
+    - incoming_messages_count
+    - outgoing_messages_count
+    - avg_first_response_time
+    - avg_resolution_time
+    - resolutions_count
 required: true
 description: The type of metric
diff --git a/swagger/parameters/report_type.yml b/swagger/parameters/report_type.yml
index 9f5fbf363..668fd0922 100644
--- a/swagger/parameters/report_type.yml
+++ b/swagger/parameters/report_type.yml
@@ -1,11 +1,12 @@
 in: query
 name: type
-type: string
-enum:
-  - account
-  - agent
-  - inbox
-  - label
-  - team
+schema:
+  type: string
+  enum:
+    - account
+    - agent
+    - inbox
+    - label
+    - team
 required: true
 description: Type of report
diff --git a/swagger/parameters/source_id.yml b/swagger/parameters/source_id.yml
index 408beed86..a2c3bb807 100644
--- a/swagger/parameters/source_id.yml
+++ b/swagger/parameters/source_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: source_id
 required: true
-type: string
+schema:
+  type: string
 description: "Id of the session for which the conversation is created.\n\n\n\n Source Ids can be obtained through contactable inboxes API or via generated.<br/><br/>Website: Chatwoot generated string which can be obtained from webhook events. <br/> Phone Channels(Twilio): Phone number in e164 format <br/> Email Channels: Contact Email address <br/> API Channel: Any Random String"
diff --git a/swagger/parameters/team_id.yml b/swagger/parameters/team_id.yml
index c18532b75..9caca20b3 100644
--- a/swagger/parameters/team_id.yml
+++ b/swagger/parameters/team_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: team_id
-type: integer
+schema:
+  type: integer
 required: true
 description: The ID of the team to be updated
diff --git a/swagger/parameters/webhook_id.yml b/swagger/parameters/webhook_id.yml
index 4400a082c..524a3e733 100644
--- a/swagger/parameters/webhook_id.yml
+++ b/swagger/parameters/webhook_id.yml
@@ -1,5 +1,6 @@
 in: path
 name: webhook_id
-type: integer
+schema:
+  type: integer
 required: true
 description: The numeric ID of the webhook
diff --git a/swagger/paths/application/agent_bots/create.yml b/swagger/paths/application/agent_bots/create.yml
index e0fde6184..bc97acb32 100644
--- a/swagger/paths/application/agent_bots/create.yml
+++ b/swagger/paths/application/agent_bots/create.yml
@@ -3,17 +3,24 @@ tags:
 operationId: create-an-account-agent-bot
 summary: Create an Agent Bot
 description: Create an agent bot in the account
-parameters:
-  - $ref: '#/parameters/account_id'
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/agent_bot_create_update_payload'
+security:
+  - userApiKey: []
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/agent_bot_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/agent_bot'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/agent_bot'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/agent_bots/delete.yml b/swagger/paths/application/agent_bots/delete.yml
index 0e3daf6cb..84dcc6f55 100644
--- a/swagger/paths/application/agent_bots/delete.yml
+++ b/swagger/paths/application/agent_bots/delete.yml
@@ -3,10 +3,20 @@ tags:
 operationId: delete-an-account-agent-bot
 summary: Delete an AgentBot
 description: Delete an AgentBot from the account
+security:
+  - userApiKey: []
 responses:
   200:
     description: Success
   401:
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
   404:
     description: The agent bot does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/agent_bots/index.yml b/swagger/paths/application/agent_bots/index.yml
index 2c5fe289f..20b0bab82 100644
--- a/swagger/paths/application/agent_bots/index.yml
+++ b/swagger/paths/application/agent_bots/index.yml
@@ -3,14 +3,21 @@ tags:
 operationId: list-all-account-agent-bots
 summary: List all AgentBots
 description: List all agent bots available for the current account
+security:
+  - userApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of agent bots'
-      items:
-        $ref: '#/definitions/agent_bot'
-
-  401:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of agent bots'
+          items:
+            $ref: '#/components/schemas/agent_bot'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/agent_bots/show.yml b/swagger/paths/application/agent_bots/show.yml
index b94637690..061908c2c 100644
--- a/swagger/paths/application/agent_bots/show.yml
+++ b/swagger/paths/application/agent_bots/show.yml
@@ -3,12 +3,24 @@ tags:
 operationId: get-details-of-a-single-account-agent-bot
 summary: Get an agent bot details
 description: Get the details of an agent bot in the account
+security:
+  - userApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/agent_bot'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/agent_bot'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given agent bot ID does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/agent_bots/update.yml b/swagger/paths/application/agent_bots/update.yml
index 562d58841..0f988cb18 100644
--- a/swagger/paths/application/agent_bots/update.yml
+++ b/swagger/paths/application/agent_bots/update.yml
@@ -3,16 +3,24 @@ tags:
 operationId: update-an-account-agent-bot
 summary: Update an agent bot
 description: Update an agent bot's attributes
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/agent_bot_create_update_payload'
+security:
+  - userApiKey: []
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/agent_bot_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/agent_bot'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/agent_bot'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/agents/create.yml b/swagger/paths/application/agents/create.yml
index dd191d81f..51436381e 100644
--- a/swagger/paths/application/agents/create.yml
+++ b/swagger/paths/application/agents/create.yml
@@ -5,39 +5,23 @@ summary: Add a New Agent
 description: Add a new Agent to Account
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - name
-        - email
-        - role
-      properties:
-        name:
-          type: string
-          description: Full Name of the agent
-        email:
-          type: string
-          description: Email of the Agent
-        role:
-          type: string
-          enum: ['agent', 'administrator']
-          description: Whether its administrator or agent
-        availability_status:
-          type: string
-          enum: ['available', 'busy', 'offline']
-          description: The availability setting of the agent.
-        auto_offline:
-          type: boolean
-          description: Whether the availability status of agent is configured to go offline automatically when away.
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/agent_create_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        description: 'Newly Created Agent'
-        $ref: '#/definitions/agent'
-  403:
+    content:
+      application/json:
+        schema:
+          description: 'Newly Created Agent'
+          $ref: '#/components/schemas/agent'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/agents/delete.yml b/swagger/paths/application/agents/delete.yml
index 118ddf234..d006659e3 100644
--- a/swagger/paths/application/agents/delete.yml
+++ b/swagger/paths/application/agents/delete.yml
@@ -8,13 +8,22 @@ security:
 parameters:
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
-    description: The ID of the agent to be deleted
+    description: The ID of the agent to be deleted.
 responses:
   200:
     description: Success
   404:
     description: Agent not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
   403:
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/agents/index.yml b/swagger/paths/application/agents/index.yml
index 7961ad3b0..2073e2ba0 100644
--- a/swagger/paths/application/agents/index.yml
+++ b/swagger/paths/application/agents/index.yml
@@ -8,10 +8,16 @@ security:
 responses:
   200:
     description: Success
-    schema:
-        type: array
-        description: 'Array of all active agents'
-        items:
-          $ref: '#/definitions/agent'
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all active agents'
+          items:
+            $ref: '#/components/schemas/agent'
   403:
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/agents/update.yml b/swagger/paths/application/agents/update.yml
index a72f5ed4e..afb5579f3 100644
--- a/swagger/paths/application/agents/update.yml
+++ b/swagger/paths/application/agents/update.yml
@@ -8,35 +8,33 @@ security:
 parameters:
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the agent to be updated.
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - role
-      properties:
-        role:
-          type: string
-          enum: ['agent', 'administrator']
-          description: Whether its administrator or agent
-        availability:
-          type: string
-          enum: ['available', 'busy', 'offline']
-          description: The availability setting of the agent.
-        auto_offline:
-          type: boolean
-          description: Whether the availability status of agent is configured to go offline automatically when away.
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/agent_update_payload'
 responses:
   200:
     description: Success
-    schema:
-        description: 'The updated agent'
-        $ref: '#/definitions/agent'
+    content:
+      application/json:
+        schema:
+          description: 'The updated agent'
+          $ref: '#/components/schemas/agent'
   404:
     description: Agent not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
   403:
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/article/create.yml b/swagger/paths/application/article/create.yml
index 0733fb860..02b13b6c1 100644
--- a/swagger/paths/application/article/create.yml
+++ b/swagger/paths/application/article/create.yml
@@ -5,16 +5,22 @@ summary: Add a new article
 description: Add a new article to portal
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/article_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/article_create_update_payload'
 responses:
   '200':
     description: Success
-    schema:
-      $ref: '#/definitions/article'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/article'
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/automation_rule/create.yml b/swagger/paths/application/automation_rule/create.yml
index ac5de803a..a8a309dad 100644
--- a/swagger/paths/application/automation_rule/create.yml
+++ b/swagger/paths/application/automation_rule/create.yml
@@ -5,16 +5,22 @@ summary: Add a new automation rule
 description: Add a new automation rule to account
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/automation_rule_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/automation_rule_create_update_payload'
 responses:
   '200':
     description: Success
-    schema:
-      $ref: '#/definitions/automation_rule'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/automation_rule'
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/automation_rule/delete.yml b/swagger/paths/application/automation_rule/delete.yml
index f82647d1d..4d30fb812 100644
--- a/swagger/paths/application/automation_rule/delete.yml
+++ b/swagger/paths/application/automation_rule/delete.yml
@@ -8,7 +8,8 @@ security:
 parameters:
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the automation rule to be deleted
 responses:
@@ -16,5 +17,13 @@ responses:
     description: Success
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
   '404':
     description: automation rule not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/automation_rule/index.yml b/swagger/paths/application/automation_rule/index.yml
index 031696aeb..e1b78fa37 100644
--- a/swagger/paths/application/automation_rule/index.yml
+++ b/swagger/paths/application/automation_rule/index.yml
@@ -3,18 +3,24 @@ tags:
 operationId: get-account-automation-rule
 summary: List all automation rules in an account
 parameters:
-  - $ref: '#/parameters/account_id'
-  - $ref: '#/parameters/page'
+  - $ref: '#/components/parameters/account_id'
+  - $ref: '#/components/parameters/page'
 description: Get details of automation rules in an Account
 security:
   - userApiKey: []
 responses:
   '200':
     description: Success
-    schema:
-      type: array
-      description: Array of all automation rules
-      items:
-        $ref: '#/definitions/automation_rule'
+    content:
+      application/json:
+        schema:
+          type: array
+          description: Array of all automation rules
+          items:
+            $ref: '#/components/schemas/automation_rule'
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/automation_rule/show.yml b/swagger/paths/application/automation_rule/show.yml
index d99f8170b..cd53ef478 100644
--- a/swagger/paths/application/automation_rule/show.yml
+++ b/swagger/paths/application/automation_rule/show.yml
@@ -3,18 +3,31 @@ tags:
 operationId: get-details-of-a-single-automation-rule
 summary: Get a automation rule details
 description: Get the details of a automation rule in the account
+security:
+  - userApiKey: []
 parameters:
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the automation rule to be updated.
 responses:
   '200':
     description: Success
-    schema:
-      $ref: '#/definitions/automation_rule'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/automation_rule'
   '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
   '404':
     description: The given rule ID does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/automation_rule/update.yml b/swagger/paths/application/automation_rule/update.yml
index 35a4cb67a..414885799 100644
--- a/swagger/paths/application/automation_rule/update.yml
+++ b/swagger/paths/application/automation_rule/update.yml
@@ -8,20 +8,32 @@ security:
 parameters:
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the automation rule to be updated.
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/automation_rule_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/automation_rule_create_update_payload'
 responses:
   '200':
     description: Success
-    schema:
-      $ref: '#/definitions/automation_rule'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/automation_rule'
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
   '404':
     description: Rule not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/canned_responses/create.yml b/swagger/paths/application/canned_responses/create.yml
index 95eacafb1..95d822a87 100644
--- a/swagger/paths/application/canned_responses/create.yml
+++ b/swagger/paths/application/canned_responses/create.yml
@@ -5,17 +5,23 @@ summary: Add a New Canned Response
 description: Add a new Canned Response to Account
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/canned_response_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/canned_response_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        description: 'Newly Created Canned Response'
-        $ref: '#/definitions/canned_response'
-  403:
+    content:
+      application/json:
+        schema:
+          description: 'Newly Created Canned Response'
+          $ref: '#/components/schemas/canned_response'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/canned_responses/delete.yml b/swagger/paths/application/canned_responses/delete.yml
index 2b1d08238..57ff1850b 100644
--- a/swagger/paths/application/canned_responses/delete.yml
+++ b/swagger/paths/application/canned_responses/delete.yml
@@ -8,13 +8,22 @@ security:
 parameters:
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the canned response to be deleted
 responses:
-  200:
+  '200':
     description: Success
-  404:
+  '404':
     description: Canned Response not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/canned_responses/index.yml b/swagger/paths/application/canned_responses/index.yml
index 3094a23a6..1b8ad694c 100644
--- a/swagger/paths/application/canned_responses/index.yml
+++ b/swagger/paths/application/canned_responses/index.yml
@@ -6,12 +6,18 @@ description: Get Details of Canned Responses in an Account
 security:
   - userApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        type: array
-        description: 'Array of all canned responses'
-        items:
-          $ref: '#/definitions/canned_response'
-  403:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all canned responses'
+          items:
+            $ref: '#/components/schemas/canned_response'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/canned_responses/update.yml b/swagger/paths/application/canned_responses/update.yml
index 7ea801f2f..57315d5be 100644
--- a/swagger/paths/application/canned_responses/update.yml
+++ b/swagger/paths/application/canned_responses/update.yml
@@ -1,5 +1,5 @@
 tags:
-  - Canned Response
+  - Canned Responses
 operationId: update-canned-response-in-account
 summary: Update Canned Response in Account
 description: Update a Canned Response in Account
@@ -8,21 +8,33 @@ security:
 parameters:
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the canned response to be updated.
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/canned_response_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/canned_response_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        description: 'The updated canned response'
-        $ref: '#/definitions/canned_response'
-  404:
+    content:
+      application/json:
+        schema:
+          description: 'The updated canned response'
+          $ref: '#/components/schemas/canned_response'
+  '404':
     description: Agent not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/category/create.yml b/swagger/paths/application/category/create.yml
index 7b569a40b..56c757517 100644
--- a/swagger/paths/application/category/create.yml
+++ b/swagger/paths/application/category/create.yml
@@ -5,16 +5,22 @@ summary: Add a new category
 description: Add a new category to portal
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/category_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/category_create_update_payload'
 responses:
   '200':
     description: Success
-    schema:
-      $ref: '#/definitions/category'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/category'
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/contact_inboxes/create.yml b/swagger/paths/application/contact_inboxes/create.yml
index 2b784b5dd..64ebeb21c 100644
--- a/swagger/paths/application/contact_inboxes/create.yml
+++ b/swagger/paths/application/contact_inboxes/create.yml
@@ -5,34 +5,47 @@ post:
   description: Create a contact inbox record for an inbox
   summary: Create contact inbox
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: id
       in: path
-      type: number
+      schema:
+        type: number
       description: ID of the contact
       required: true
-    - name: data
-      in: body
-      required: true
-      schema:
-        type: object
-        required:
-          - inbox_id
-        properties:
-          inbox_id:
-            type: number
-            description: The ID of the inbox
-          source_id:
-            type: string
-            description: Contact Inbox Source Id
+  security:
+    - userApiKey: []
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          type: object
+          required:
+            - inbox_id
+          properties:
+            inbox_id:
+              type: number
+              description: The ID of the inbox
+              example: 1
+            source_id:
+              type: string
+              description: Contact Inbox Source Id
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        $ref: '#/definitions/contact_inboxes'
-    401:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/contact_inboxes'
+    '401':
       description: Authentication error
-      schema:
-        $ref: '#/definitions/bad_request_error'
-    422:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '422':
       description: Incorrect payload
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/contactable_inboxes/get.yml b/swagger/paths/application/contactable_inboxes/get.yml
index 23ce37788..3f56f6939 100644
--- a/swagger/paths/application/contactable_inboxes/get.yml
+++ b/swagger/paths/application/contactable_inboxes/get.yml
@@ -4,21 +4,32 @@ get:
   operationId: contactableInboxesGet
   description: Get List of contactable Inboxes
   summary: Get Contactable Inboxes
+  security:
+    - userApiKey: []
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: id
       in: path
-      type: number
+      schema:
+        type: number
       description: ID of the contact
       required: true
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        $ref: '#/definitions/contactable_inboxes'
-    401:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/contactable_inboxes'
+    '401':
       description: Authentication error
-      schema:
-        $ref: '#/definitions/bad_request_error'
-    422:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '422':
       description: Incorrect payload
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/contacts/conversations.yml b/swagger/paths/application/contacts/conversations.yml
index d08235f5e..e6c586298 100644
--- a/swagger/paths/application/contacts/conversations.yml
+++ b/swagger/paths/application/contacts/conversations.yml
@@ -1,22 +1,43 @@
+parameters:
+  - $ref: '#/components/parameters/account_id'
+  - name: id
+    in: path
+    required: true
+    schema:
+      type: number
+    description: ID of the contact
+
 get:
   tags:
     - Contacts
   operationId: contactConversations
   summary: Contact Conversations
-  description: Get conversations associated to that contact
+  description: Get conversations associated with that contact
   parameters:
-    - $ref: '#/parameters/account_id'
     - name: id
       in: path
-      type: number
-      description: ID of the contact
       required: true
-  responses:
-    200:
-      description: Success
       schema:
-        $ref: '#/definitions/contact_conversations'
-    404:
+        type: number
+      description: ID of the contact
+  security:
+    - userApiKey: []
+  responses:
+    '200':
+      description: Success
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/contact_conversations'
+    '404':
       description: Contact not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/contacts/crud.yml b/swagger/paths/application/contacts/crud.yml
index 3c982dfe9..9f76e4ba4 100644
--- a/swagger/paths/application/contacts/crud.yml
+++ b/swagger/paths/application/contacts/crud.yml
@@ -1,58 +1,94 @@
 parameters:
-  - $ref: '#/parameters/account_id'
+  - $ref: '#/components/parameters/account_id'
   - name: id
     in: path
-    type: number
-    description: ID of the contact
     required: true
+    schema:
+      type: number
+    description: ID of the contact
 
 get:
   tags:
     - Contacts
   operationId: contactDetails
   summary: Show Contact
+  security:
+    - userApiKey: []
   description: Get a contact belonging to the account using ID
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        $ref: '#/definitions/extended_contact'
-    404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/extended_contact'
+    '404':
       description: Contact not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
 
 put:
   tags:
     - Contacts
   operationId: contactUpdate
   summary: Update Contact
+  security:
+    - userApiKey: []
   description: Update a contact belonging to the account using ID
-  parameters:
-    - name: data
-      in: body
-      required: true
-      schema:
-        $ref: '#/definitions/contact_update'
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/contact_update_payload'
   responses:
-    204:
+    '204':
       description: Success
-      schema:
-        $ref: '#/definitions/contact_base'
-    404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/contact_base'
+    '404':
       description: Contact not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
 
 delete:
   tags:
     - Contacts
   operationId: contactDelete
   summary: Delete Contact
+  security:
+    - userApiKey: []
+  description: Delete a contact belonging to the account using ID
   responses:
-    200:
+    '200':
       description: Success
-    401:
+    '401':
       description: Unauthorized
-    404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '404':
       description: Contact not found
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/contacts/filter.yml b/swagger/paths/application/contacts/filter.yml
index 2a1d53cf7..58b297d81 100644
--- a/swagger/paths/application/contacts/filter.yml
+++ b/swagger/paths/application/contacts/filter.yml
@@ -1,58 +1,64 @@
-tags:
-  - Contacts
-operationId: contactFilter
-description: Filter contacts with custom filter options and pagination
-summary: Contact Filter
-security:
-  - userApiKey: []
-  - agentBotApiKey: []
-parameters:
-  - name: page
-    in: query
-    type: integer
-  - name: body
-    in: body
+post:
+  tags:
+    - Contacts
+  operationId: contactFilter
+  description: Filter contacts with custom filter options and pagination
+  summary: Contact Filter
+  security:
+    - userApiKey: []
+  parameters:
+    - $ref: '#/components/parameters/account_id'
+    - name: page
+      in: query
+      schema:
+        type: number
+  requestBody:
     required: true
-    schema:
-      type: object
-      properties:
-        payload:
-          type: array
-          items:
-            type: object
-            properties:
-              attribute_key:
-                type: string
-                description: filter attribute name
-              filter_operator:
-                type: string
-                description: filter operator name
-                enum: [ equal_to, not_equal_to, contains, does_not_contain ]
-              values:
-                type: array
-                items:
-                  type: string
-                description: array of the attribute values to filter
-              query_operator:
-                type: string
-                description: query operator name
-                enum: [ AND, OR ]
-          example:
-            - attribute_key: 'name'
-              filter_operator: 'equal_to'
-              values: ['en']
-              query_operator: 'AND'
-            - attribute_key: 'country_code'
-              filter_operator: 'equal_to'
-              values: ['us']
-              query_operator: null
-
-responses:
-  200:
-    description: Success
-    schema:
-      $ref: '#/definitions/contact_list'
-  400:
-    description: Bad Request Error
-    schema:
-      $ref: '#/definitions/bad_request_error'
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            payload:
+              type: array
+              items:
+                type: object
+                properties:
+                  attribute_key:
+                    type: string
+                    description: filter attribute name
+                  filter_operator:
+                    type: string
+                    description: filter operator name
+                    enum: [equal_to, not_equal_to, contains, does_not_contain]
+                  values:
+                    type: array
+                    items:
+                      type: string
+                    description: array of the attribute values to filter
+                  query_operator:
+                    type: string
+                    description: query operator name
+                    enum: [AND, OR]
+              example:
+                - attribute_key: 'name'
+                  filter_operator: 'equal_to'
+                  values: ['en']
+                  query_operator: 'AND'
+                - attribute_key: 'country_code'
+                  filter_operator: 'equal_to'
+                  values: ['us']
+                  query_operator: null
+  responses:
+    '200':
+      description: Success
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/contact_list'
+    '400':
+      description: Bad Request Error
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/contacts/labels.yml b/swagger/paths/application/contacts/labels.yml
new file mode 100644
index 000000000..61be4a545
--- /dev/null
+++ b/swagger/paths/application/contacts/labels.yml
@@ -0,0 +1,79 @@
+parameters:
+  - $ref: '#/components/parameters/account_id'
+  - name: id
+    in: path
+    required: true
+    schema:
+      type: number
+    description: ID of the contact
+
+get:
+  tags:
+    - Contacts
+  operationId: list-all-labels-of-a-contact
+  summary: List Labels
+  description: Lists all the labels of a contact
+  security:
+    - userApiKey: []
+  responses:
+    '200':
+      description: Success
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/contact_labels'
+    '401':
+      description: Unauthorized
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '404':
+      description: Contact not found
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+
+post:
+  tags:
+    - Contacts
+  operationId: contact-add-labels
+  summary: Add Labels
+  description: Add labels to a contact. Note that this API would overwrite the existing list of labels associated to the conversation.
+  security:
+    - userApiKey: []
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          type: object
+          required:
+            - labels
+          properties:
+            labels:
+              type: array
+              description: Array of labels (comma-separated strings)
+              items:
+                type: string
+              example: ['support', 'billing']
+  responses:
+    '200':
+      description: Success
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/contact_labels'
+    '401':
+      description: Unauthorized
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '404':
+      description: Contact not found
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/contacts/labels/create.yml b/swagger/paths/application/contacts/labels/create.yml
deleted file mode 100644
index 01821d688..000000000
--- a/swagger/paths/application/contacts/labels/create.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-tags:
-  - Contact Labels
-operationId: contact-add-labels
-summary: Add Labels
-description: Add labels to a contact. Note that this API would overwrite the existing list of labels associated to the conversation.
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      properties:
-        labels:
-          type: array
-          description: Array of labels (comma-separated strings)
-          items:
-            type: string
-responses:
-  200:
-    description: Success
-    schema:
-      $ref: '#/definitions/contact_labels'
-  404:
-    description: Contact not found
-  401:
-    description: Unauthorized
diff --git a/swagger/paths/application/contacts/labels/index.yml b/swagger/paths/application/contacts/labels/index.yml
deleted file mode 100644
index ad3c7ff81..000000000
--- a/swagger/paths/application/contacts/labels/index.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-tags:
-  - Contact Labels
-operationId: list-all-labels-of-a-contact
-summary: List Labels
-description: Lists all the labels of a contact
-responses:
-  200:
-    description: Success
-    schema:
-      $ref: '#/definitions/contact_labels'
-  404:
-    description: Contact not found
-  401:
-    description: Unauthorized
diff --git a/swagger/paths/application/contacts/list_create.yml b/swagger/paths/application/contacts/list_create.yml
index 4329ed3b7..505fd8200 100644
--- a/swagger/paths/application/contacts/list_create.yml
+++ b/swagger/paths/application/contacts/list_create.yml
@@ -2,21 +2,27 @@ get:
   tags:
     - Contacts
   operationId: contactList
-  description: Listing all the resolved contacts with pagination (Page size = 15) . Resolved contacts are the ones with a value for identifier, email or phone number
+  description: Listing all the resolved contacts with pagination (Page size = 15). Resolved contacts are the ones with a value for identifier, email or phone number
   summary: List Contacts
+  security:
+    - userApiKey: []
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/contact_sort_param'
-    - $ref: '#/parameters/page'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/contact_sort_param'
+    - $ref: '#/components/parameters/page'
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        $ref: '#/definitions/contact_list'
-    400:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/contact_list'
+    '400':
       description: Bad Request Error
-      schema:
-        $ref: '#/definitions/bad_request_error'
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
 
 post:
   tags:
@@ -24,19 +30,26 @@ post:
   operationId: contactCreate
   description: Create a new Contact
   summary: Create Contact
+  security:
+    - userApiKey: []
   parameters:
-    - $ref: '#/parameters/account_id'
-    - name: data
-      in: body
-      required: true
-      schema:
-        $ref: '#/definitions/contact_create'
+    - $ref: '#/components/parameters/account_id'
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/contact_create_payload'
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        $ref: '#/definitions/extended_contact'
-    400:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/extended_contact'
+    '400':
       description: Bad Request Error
-      schema:
-        $ref: '#/definitions/bad_request_error'
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/contacts/search.yml b/swagger/paths/application/contacts/search.yml
index 63cc11903..c44406e6c 100644
--- a/swagger/paths/application/contacts/search.yml
+++ b/swagger/paths/application/contacts/search.yml
@@ -4,23 +4,30 @@ get:
   operationId: contactSearch
   description: Search the resolved contacts using a search key, currently supports email search (Page size = 15). Resolved contacts are the ones with a value for identifier, email or phone number
   summary: Search Contacts
+  security:
+    - userApiKey: []
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: q
       in: query
-      type: string
+      schema:
+        type: string
       description: Search using contact `name`, `identifier`, `email` or `phone number`
-    - $ref: '#/parameters/contact_sort_param'
-    - $ref: '#/parameters/page'
+    - $ref: '#/components/parameters/contact_sort_param'
+    - $ref: '#/components/parameters/page'
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        type: object
-        properties:
-          payload:
-            $ref: '#/definitions/contact_list'
-    401:
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              payload:
+                $ref: '#/components/schemas/contact_list'
+    '401':
       description: Authentication error
-      schema:
-        $ref: '#/definitions/bad_request_error'
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/assignments.yml b/swagger/paths/application/conversation/assignments.yml
index a67ce59ad..50fdacbf0 100644
--- a/swagger/paths/application/conversation/assignments.yml
+++ b/swagger/paths/application/conversation/assignments.yml
@@ -1,30 +1,42 @@
 tags:
-  - Conversation Assignment
+  - Conversations
 operationId: assign-a-conversation
 summary: Assign Conversation
 description: Assign a conversation to an agent or a team
 security:
   - userApiKey: []
   - agentBotApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      properties:
-        assignee_id:
-          type: number
-          description: Id of the assignee user
-        team_id:
-          type: number
-          description: Id of the team. If the assignee_id is present, this param would be ignored
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        properties:
+          assignee_id:
+            type: number
+            description: Id of the assignee user
+            example: 1
+          team_id:
+            type: number
+            description: Id of the team. If the assignee_id is present, this param would be ignored
+            example: 1
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/user'
-  404:
-    description: Conversation not found
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/user'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/custom_attributes.yml b/swagger/paths/application/conversation/custom_attributes.yml
index bfd416138..6e5786742 100644
--- a/swagger/paths/application/conversation/custom_attributes.yml
+++ b/swagger/paths/application/conversation/custom_attributes.yml
@@ -5,32 +5,41 @@ summary: Update Custom Attributes
 description: Updates the custom attributes of a conversation
 security:
   - userApiKey: []
-  - agentBotApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - custom_attributes
-      properties:
-        custom_attributes:
-          type: object
-          description: The custom attributes to be set for the conversation
-          example:
-            order_id: "12345"
-            previous_conversation: "67890"
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - custom_attributes
+        properties:
+          custom_attributes:
+            type: object
+            description: The custom attributes to be set for the conversation
+            example:
+              order_id: '12345'
+              previous_conversation: '67890'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: object
-      properties:
-        custom_attributes:
+    content:
+      application/json:
+        schema:
           type: object
-          description: The custom attributes of the conversation
-  404:
+          properties:
+            custom_attributes:
+              type: object
+              description: The custom attributes of the conversation
+  '401':
+    description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: Conversation not found
-  401:
-    description: Unauthorized 
\ No newline at end of file
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/filter.yml b/swagger/paths/application/conversation/filter.yml
index 4ee5f5d54..fdb318f6a 100644
--- a/swagger/paths/application/conversation/filter.yml
+++ b/swagger/paths/application/conversation/filter.yml
@@ -5,54 +5,59 @@ description: Filter conversations with custom filter options and pagination
 summary: Conversations Filter
 security:
   - userApiKey: []
-  - agentBotApiKey: []
 parameters:
   - name: page
     in: query
-    type: integer
-  - name: body
-    in: body
-    required: true
     schema:
-      type: object
-      properties:
-        payload:
-          type: array
-          items:
-            type: object
-            properties:
-              attribute_key:
-                type: string
-                description: filter attribute name
-              filter_operator:
-                type: string
-                description: filter operator name
-                enum: [ equal_to, not_equal_to, contains, does_not_contain ]
-              values:
-                type: array
-                items:
+      type: number
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        properties:
+          payload:
+            type: array
+            items:
+              type: object
+              properties:
+                attribute_key:
                   type: string
-                description: array of the attribute values to filter
-              query_operator:
-                type: string
-                description: query operator name
-                enum: [ AND, OR ]
-          example:
-            - attribute_key: 'browser_language'
-              filter_operator: 'not_eq'
-              values: ['en']
-              query_operator: 'AND'
-            - attribute_key: 'status'
-              filter_operator: 'eq'
-              values: ['pending']
-              query_operator: null
+                  description: filter attribute name
+                filter_operator:
+                  type: string
+                  description: filter operator name
+                  enum: [equal_to, not_equal_to, contains, does_not_contain]
+                values:
+                  type: array
+                  items:
+                    type: string
+                  description: array of the attribute values to filter
+                query_operator:
+                  type: string
+                  description: query operator name
+                  enum: [AND, OR]
+            example:
+              - attribute_key: 'browser_language'
+                filter_operator: 'not_equal_to'
+                values: ['en']
+                query_operator: 'AND'
+              - attribute_key: 'status'
+                filter_operator: 'equal_to'
+                values: ['pending']
+                query_operator: null
 
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/conversation_list'
-  400:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/conversation_list'
+  '400':
     description: Bad Request Error
-    schema:
-      $ref: '#/definitions/bad_request_error'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/index.yml b/swagger/paths/application/conversation/index.yml
index 6980eb2bd..e58659530 100644
--- a/swagger/paths/application/conversation/index.yml
+++ b/swagger/paths/application/conversation/index.yml
@@ -1,5 +1,5 @@
 parameters:
-  - $ref: '#/parameters/account_id'
+  - $ref: '#/components/parameters/account_id'
 
 get:
   tags:
@@ -7,138 +7,98 @@ get:
   operationId: conversationList
   description: List all the conversations with pagination
   summary: Conversations List
+  security:
+    - userApiKey: []
   parameters:
     - name: assignee_type
       in: query
-      type: string
-      enum: ['me', 'unassigned', 'all', 'assigned']
-      default: 'all'
+      schema:
+        type: string
+        enum: ['me', 'unassigned', 'all', 'assigned']
+        default: 'all'
       description: Filter conversations by assignee type.
     - name: status
       in: query
-      type: string
-      enum: ['all', 'open', 'resolved', 'pending', 'snoozed']
-      default: 'open'
+      schema:
+        type: string
+        enum: ['all', 'open', 'resolved', 'pending', 'snoozed']
+        default: 'open'
       description: Filter by conversation status.
     - name: q
       in: query
-      type: string
+      schema:
+        type: string
       description: Filters conversations with messages containing the search term
     - name: inbox_id
       in: query
-      type: integer
+      schema:
+        type: integer
     - name: team_id
       in: query
-      type: integer
+      schema:
+        type: integer
     - name: labels
       in: query
-      type: array
-      items:
-        type: string
+      schema:
+        type: array
+        items:
+          type: string
     - name: page
       in: query
-      type: integer
-      default: 1
+      schema:
+        type: integer
+        default: 1
       description: paginate through conversations
 
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        $ref: '#/definitions/conversation_list'
-    400:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/conversation_list'
+    '400':
       description: Bad Request Error
-      schema:
-        $ref: '#/definitions/bad_request_error'
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
 
 post:
   tags:
     - Conversations
   operationId: newConversation
   summary: Create New Conversation
-  description: "Creating a conversation in chatwoot requires a source id. \n\n Learn more about source_id: https://github.com/chatwoot/chatwoot/wiki/Building-on-Top-of-Chatwoot:-Importing-Existing-Contacts-and-Creating-Conversations"
+  description: "Creating a conversation in chatwoot requires a source id. \n\n Learn more about source_id: https://www.chatwoot.com/hc/user-guide/articles/1677839703-how-to-create-an-api-channel-inbox#send-messages-to-the-api-channel"
   security:
     - userApiKey: []
     - agentBotApiKey: []
-  parameters:
-    - name: data
-      in: body
-      required: true
-      schema:
-        type: object
-        required:
-          - source_id
-          - inbox_id
-        properties:
-          source_id:
-            type: string
-            description: Conversation source id
-          inbox_id:
-            type: string
-            description: "Id of inbox in which the conversation is created <br/> Allowed Inbox Types: Website, Phone, Api, Email "
-          contact_id:
-            type: string
-            description: Contact Id for which conversation is created
-          additional_attributes:
-            type: object
-            description: Lets you specify attributes like browser information
-          custom_attributes:
-            type: object
-            description: The object to save custom attributes for conversation, accepts custom attributes key and value
-            example: { attribute_key: attribute_value, priority_conversation_number: 3 }
-          status:
-            type: string
-            enum: ['open', 'resolved', 'pending']
-            description: Specify the conversation whether it's pending, open, closed
-          assignee_id:
-            type: string
-            description: Agent Id for assigning a conversation to an agent
-          team_id:
-            type: string
-            description: Team Id for assigning a conversation to a team
-          message:
-            type: object
-            description: The initial message to be sent to the conversation
-            required: ['content']
-            properties:
-              content:
-                type: string
-                description: The content of the message
-              template_params:
-                type: object
-                description: The template params for the message in case of whatsapp Channel
-                properties:
-                  name:
-                    type: string
-                    description: Name of the template
-                    example: 'sample_issue_resolution'
-                  category:
-                    type: string
-                    description: Category of the template
-                    example: UTILITY
-                  language:
-                    type: string
-                    description: Language of the template
-                    example: en_US
-                  processed_params: 
-                    type: object
-                    description: The processed param values for template variables in template
-                    example: 
-                      1: "Chatwoot"
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/conversation_create_payload'
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        type: object
-        properties:
-          id:
-            type: number
-            description: ID of the conversation
-          account_id:
-            type: number
-            description: Account Id
-          inbox_id:
-            type: number
-            description: ID of the inbox
-    403:
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              id:
+                type: number
+                description: ID of the conversation
+              account_id:
+                type: number
+                description: Account Id
+              inbox_id:
+                type: number
+                description: ID of the inbox
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/labels/create.yml b/swagger/paths/application/conversation/labels/create.yml
index 0f686ee24..6df685ccd 100644
--- a/swagger/paths/application/conversation/labels/create.yml
+++ b/swagger/paths/application/conversation/labels/create.yml
@@ -1,26 +1,41 @@
 tags:
-  - Conversation Labels
+  - Conversations
 operationId: conversation-add-labels
 summary: Add Labels
+security:
+  - userApiKey: []
 description: Add labels to a conversation. Note that this API would overwrite the existing list of labels associated to the conversation.
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      properties:
-        labels:
-          type: array
-          description: Array of labels (comma-separated strings)
-          items:
-            type: string
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - labels
+        properties:
+          labels:
+            type: array
+            description: Array of labels (comma-separated strings)
+            items:
+              type: string
+            example: ['support', 'billing']
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/conversation_labels'
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/conversation_labels'
+  '404':
     description: Conversation not found
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/labels/index.yml b/swagger/paths/application/conversation/labels/index.yml
index 107fc0132..5c8b3e597 100644
--- a/swagger/paths/application/conversation/labels/index.yml
+++ b/swagger/paths/application/conversation/labels/index.yml
@@ -1,14 +1,26 @@
 tags:
-  - Conversation Labels
+  - Conversations
 operationId: list-all-labels-of-a-conversation
 summary: List Labels
+security:
+  - userApiKey: []
 description: Lists all the labels of a conversation
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/conversation_labels'
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/conversation_labels'
+  '404':
     description: Conversation not found
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/messages/create.yml b/swagger/paths/application/conversation/messages/create.yml
index 4ab9e27a0..f8cd35f3c 100644
--- a/swagger/paths/application/conversation/messages/create.yml
+++ b/swagger/paths/application/conversation/messages/create.yml
@@ -6,20 +6,30 @@ description: Create a new message in the conversation
 security:
   - userApiKey: []
   - agentBotApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/conversation_message_create'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/conversation_message_create_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      allOf:
-        - $ref: '#/definitions/generic_id'
-        - $ref: '#/definitions/message'
-  404:
+    content:
+      application/json:
+        schema:
+          allOf:
+            - $ref: '#/components/schemas/generic_id'
+            - $ref: '#/components/schemas/message'
+  '404':
     description: Conversation not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/messages/create_attachment.yml b/swagger/paths/application/conversation/messages/create_attachment.yml
index 594f9a819..63acd0aa5 100644
--- a/swagger/paths/application/conversation/messages/create_attachment.yml
+++ b/swagger/paths/application/conversation/messages/create_attachment.yml
@@ -3,46 +3,55 @@ post:
     - Messages
   operationId: conversationNewMessageAttachment
   summary: Create New Message Attachment
-  description: Create an attachment message. Refer to this discussion if you have any further doubts. https://github.com/chatwoot/chatwoot/discussions/1809#discussioncomment-1211845
-  consumes:
-    - multipart/form-data
+  description: Create an attachment message.
   security:
     - userApiKey: []
-    - agentBotApiKey: []
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
-      required: true
-    - in: formData
-      name: content
-      type: string
-      description: The content of the message
-      required: true
-    - in: formData
-      name: message_type
-      type: string
-      enum: ['outgoing', 'incoming']
-    - in: formData
-      name: private
-      type: boolean
-      description: Flag to identify if it is a private note
-    - in: formData
-      name: attachments[]
-      type: array
-      description: The files to be uploaded.
-      items:
-        type: string
-        format: binary
-
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
+  requestBody:
+    required: true
+    content:
+      multipart/form-data:
+        schema:
+          type: object
+          required:
+            - content
+          properties:
+            content:
+              type: string
+              description: The content of the message
+            message_type:
+              type: string
+              enum: ['outgoing', 'incoming']
+            private:
+              type: boolean
+              description: Flag to identify if it is a private note
+            attachments:
+              type: array
+              description: The files to be uploaded.
+              items:
+                type: string
+                format: binary
 
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        allOf:
-          - $ref: '#/definitions/generic_id'
-          - $ref: '#/definitions/message'
-    404:
+      content:
+        application/json:
+          schema:
+            allOf:
+              - $ref: '#/components/schemas/generic_id'
+              - $ref: '#/components/schemas/message'
+    '404':
       description: Conversation not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/messages/delete.yml b/swagger/paths/application/conversation/messages/delete.yml
index f038074c7..73b1e495b 100644
--- a/swagger/paths/application/conversation/messages/delete.yml
+++ b/swagger/paths/application/conversation/messages/delete.yml
@@ -2,11 +2,21 @@ tags:
   - Messages
 operationId: delete-a-message
 summary: Delete a message
+security:
+  - userApiKey: []
 description: Delete a message and it's attachments from the conversation.
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The message or conversation does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/messages/index.yml b/swagger/paths/application/conversation/messages/index.yml
index d99e8393b..fc6882b33 100644
--- a/swagger/paths/application/conversation/messages/index.yml
+++ b/swagger/paths/application/conversation/messages/index.yml
@@ -2,18 +2,30 @@ tags:
   - Messages
 operationId: list-all-messages
 summary: Get messages
+security:
+  - userApiKey: []
 description: List all messages of a conversation
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: Array of messages
-      items:
-        allOf:
-          - $ref: '#/definitions/generic_id'
-          - $ref: '#/definitions/message'
-  404:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: Array of messages
+          items:
+            allOf:
+              - $ref: '#/components/schemas/generic_id'
+              - $ref: '#/components/schemas/message'
+  '404':
     description: Conversation not found
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/meta.yml b/swagger/paths/application/conversation/meta.yml
index 327fb702e..811ebbf5e 100644
--- a/swagger/paths/application/conversation/meta.yml
+++ b/swagger/paths/application/conversation/meta.yml
@@ -1,5 +1,5 @@
 parameters:
-  - $ref: '#/parameters/account_id'
+  - $ref: '#/components/parameters/account_id'
 
 get:
   tags:
@@ -7,47 +7,58 @@ get:
   operationId: conversationListMeta
   description: Get open, unassigned and all Conversation counts
   summary: Get Conversation Counts
+  security:
+    - userApiKey: []
   parameters:
     - name: status
       in: query
-      type: string
-      enum: ['all', 'open', 'resolved', 'pending', 'snoozed']
-      default: 'open'
+      schema:
+        type: string
+        enum: ['all', 'open', 'resolved', 'pending', 'snoozed']
+        default: 'open'
       description: Filter by conversation status.
     - name: q
       in: query
-      type: string
+      schema:
+        type: string
       description: Filters conversations with messages containing the search term
     - name: inbox_id
       in: query
-      type: integer
+      schema:
+        type: integer
     - name: team_id
       in: query
-      type: integer
+      schema:
+        type: integer
     - name: labels
       in: query
-      type: array
-      items:
-        type: string
+      schema:
+        type: array
+        items:
+          type: string
 
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        type: object
-        properties:
-          meta:
+      content:
+        application/json:
+          schema:
             type: object
             properties:
-              mine_count:
-                type: number
-              unassigned_count:
-                type: number
-              assigned_count:
-                type: number
-              all_count:
-                type: number
-    400:
+              meta:
+                type: object
+                properties:
+                  mine_count:
+                    type: number
+                  unassigned_count:
+                    type: number
+                  assigned_count:
+                    type: number
+                  all_count:
+                    type: number
+    '400':
       description: Bad Request Error
-      schema:
-        $ref: '#/definitions/bad_request_error'
\ No newline at end of file
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/show.yml b/swagger/paths/application/conversation/show.yml
index 56c3a292b..a57c36051 100644
--- a/swagger/paths/application/conversation/show.yml
+++ b/swagger/paths/application/conversation/show.yml
@@ -2,13 +2,25 @@ tags:
   - Conversations
 operationId: get-details-of-a-conversation
 summary: Conversation Details
+security:
+  - userApiKey: []
 description: Get all details regarding a conversation with all messages in the conversation
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/conversation_show'
-  404:
-    description: Conversation not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/conversation_show'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/toggle_priority.yml b/swagger/paths/application/conversation/toggle_priority.yml
index 22a80c891..7ae3c252f 100644
--- a/swagger/paths/application/conversation/toggle_priority.yml
+++ b/swagger/paths/application/conversation/toggle_priority.yml
@@ -6,23 +6,32 @@ description: Toggles the priority of conversation
 security:
   - userApiKey: []
   - agentBotApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - priority
-      properties:
-        priority:
-          type: string
-          enum:  ["urgent", "high", "medium", "low", "none"]
-          description: "The priority of the conversation"
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - priority
+        properties:
+          priority:
+            type: string
+            enum: ['urgent', 'high', 'medium', 'low', 'none']
+            description: 'The priority of the conversation'
+            example: 'high'
 responses:
-  200:
+  '200':
     description: Success
-  404:
-    description: Conversation not found
-  401:
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/toggle_status.yml b/swagger/paths/application/conversation/toggle_status.yml
index 20b18d6aa..9c6f9ee6a 100644
--- a/swagger/paths/application/conversation/toggle_status.yml
+++ b/swagger/paths/application/conversation/toggle_status.yml
@@ -6,25 +6,36 @@ description: Toggles the status of the conversation between open and resolved
 security:
   - userApiKey: []
   - agentBotApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - status
-      properties:
-        status:
-          type: string
-          enum: ["open", "resolved", "pending"]
-          description: The status of the conversation
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - status
+        properties:
+          status:
+            type: string
+            enum: ['open', 'resolved', 'pending']
+            description: The status of the conversation
+            example: open
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/conversation_status_toggle'
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/conversation_status_toggle'
+  '404':
     description: Conversation not found
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/update.yml b/swagger/paths/application/conversation/update.yml
index 3add02635..fbe8e668b 100644
--- a/swagger/paths/application/conversation/update.yml
+++ b/swagger/paths/application/conversation/update.yml
@@ -6,24 +6,34 @@ description: Update Conversation Attributes
 security:
   - userApiKey: []
   - agentBotApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      properties:
-        priority:
-          type: string
-          enum:  ["urgent", "high", "medium", "low", "none"]
-          description: "The priority of the conversation"
-        sla_policy_id:
-          type: number
-          description: "The ID of the SLA policy (Available only in Enterprise edition)"
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        properties:
+          priority:
+            type: string
+            enum: ['urgent', 'high', 'medium', 'low', 'none']
+            description: 'The priority of the conversation'
+            example: 'high'
+          sla_policy_id:
+            type: number
+            description: 'The ID of the SLA policy (Available only in Enterprise edition)'
+            example: 1
 responses:
-  200:
+  '200':
     description: Success
-  404:
-    description: Conversation not found
-  401:
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/conversation/update_last_seen.yml b/swagger/paths/application/conversation/update_last_seen.yml
index 0f542dd7f..a81f6f219 100644
--- a/swagger/paths/application/conversation/update_last_seen.yml
+++ b/swagger/paths/application/conversation/update_last_seen.yml
@@ -3,6 +3,8 @@ post:
     - Conversations
   operationId: conversationUpdateLastSeen
   summary: Update Last Seen
+  security:
+    - userApiKey: []
   description: Updates the last seen of the conversation so that conversations will have the bubbles in the agents screen
   parameters:
     - name: id
@@ -11,9 +13,17 @@ post:
       description: ID of the conversation
       required: true
   responses:
-    200:
+    '200':
       description: Success
-    404:
-      description: Contact not found
-    403:
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '404':
+      description: Contact not found
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_attributes/create.yml b/swagger/paths/application/custom_attributes/create.yml
index fa01fc8e4..615dd6c74 100644
--- a/swagger/paths/application/custom_attributes/create.yml
+++ b/swagger/paths/application/custom_attributes/create.yml
@@ -5,16 +5,22 @@ summary: Add a new custom attribute
 description: Add a new custom attribute to account
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/custom_attribute_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/custom_attribute_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-       $ref: '#/definitions/custom_attribute'
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/custom_attribute'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_attributes/delete.yml b/swagger/paths/application/custom_attributes/delete.yml
index 0c9aaedee..313425a71 100644
--- a/swagger/paths/application/custom_attributes/delete.yml
+++ b/swagger/paths/application/custom_attributes/delete.yml
@@ -6,16 +6,25 @@ description: Remove a custom attribute from account
 security:
   - userApiKey: []
 parameters:
-  - $ref: '#/parameters/account_id'
+  - $ref: '#/components/parameters/account_id'
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the custom attribute to be deleted
 responses:
-  200:
+  '200':
     description: Success
-  404:
+  '404':
     description: Custom attribute not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_attributes/index.yml b/swagger/paths/application/custom_attributes/index.yml
index a3a91144b..2d61a0925 100644
--- a/swagger/paths/application/custom_attributes/index.yml
+++ b/swagger/paths/application/custom_attributes/index.yml
@@ -3,22 +3,29 @@ tags:
 operationId: get-account-custom-attribute
 summary: List all custom attributes in an account
 parameters:
-    - name: attribute_model
-      in: query
+  - name: attribute_model
+    in: query
+    schema:
       type: string
       enum: ['0', '1']
-      description: conversation_attribute(0)/contact_attribute(1)
-      required: true
+    description: conversation_attribute(0)/contact_attribute(1)
+    required: true
 description: Get details of custom attributes in an Account
 security:
   - userApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        type: array
-        description: 'Array of all custom attributes'
-        items:
-          $ref: '#/definitions/custom_attribute'
-  403:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all custom attributes'
+          items:
+            $ref: '#/components/schemas/custom_attribute'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_attributes/show.yml b/swagger/paths/application/custom_attributes/show.yml
index 8449ba9be..9910f7f85 100644
--- a/swagger/paths/application/custom_attributes/show.yml
+++ b/swagger/paths/application/custom_attributes/show.yml
@@ -2,20 +2,33 @@ tags:
   - Custom Attributes
 operationId: get-details-of-a-single-custom-attribute
 summary: Get a custom attribute details
+security:
+  - userApiKey: []
 description: Get the details of a custom attribute in the account
 parameters:
-  - $ref: '#/parameters/account_id'
+  - $ref: '#/components/parameters/account_id'
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the custom attribute to be updated.
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/custom_attribute'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/custom_attribute'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given attribute ID does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_attributes/update.yml b/swagger/paths/application/custom_attributes/update.yml
index 4b69f21bd..d3ccc6af1 100644
--- a/swagger/paths/application/custom_attributes/update.yml
+++ b/swagger/paths/application/custom_attributes/update.yml
@@ -8,21 +8,33 @@ security:
 parameters:
   - in: path
     name: id
-    type: integer
+    schema:
+      type: integer
     required: true
     description: The ID of the custom attribute to be updated.
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/custom_attribute_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/custom_attribute_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        description: 'The updated custom attribute'
-        $ref: '#/definitions/custom_attribute'
-  404:
+    content:
+      application/json:
+        schema:
+          description: 'The updated custom attribute'
+          $ref: '#/components/schemas/custom_attribute'
+  '404':
     description: Agent not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_filters/create.yml b/swagger/paths/application/custom_filters/create.yml
index 9d9534976..5b7a6ca80 100644
--- a/swagger/paths/application/custom_filters/create.yml
+++ b/swagger/paths/application/custom_filters/create.yml
@@ -4,16 +4,25 @@ operationId: create-a-custom-filter
 summary: Create a custom filter
 description: Create a custom filter in the account
 parameters:
-  - $ref: '#/parameters/account_id'
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/custom_filter_create_update_payload'
+  - $ref: '#/components/parameters/account_id'
+security:
+  - userApiKey: []
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/custom_filter_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/custom_filter'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/custom_filter'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_filters/delete.yml b/swagger/paths/application/custom_filters/delete.yml
index e66748858..5553bbeae 100644
--- a/swagger/paths/application/custom_filters/delete.yml
+++ b/swagger/paths/application/custom_filters/delete.yml
@@ -2,11 +2,21 @@ tags:
   - Custom Filters
 operationId: delete-a-custom-filter
 summary: Delete a custom filter
+security:
+  - userApiKey: []
 description: Delete a custom filter from the account
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The custom filter does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_filters/index.yml b/swagger/paths/application/custom_filters/index.yml
index b77949dc3..0c4f7578f 100644
--- a/swagger/paths/application/custom_filters/index.yml
+++ b/swagger/paths/application/custom_filters/index.yml
@@ -3,13 +3,21 @@ tags:
 operationId: list-all-filters
 summary: List all custom filters
 description: List all custom filters in a category of a user
+security:
+  - userApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of custom filters'
-      items:
-        $ref: '#/definitions/custom_filter'
-  401:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of custom filters'
+          items:
+            $ref: '#/components/schemas/custom_filter'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_filters/show.yml b/swagger/paths/application/custom_filters/show.yml
index 14de07d85..cf298a4ad 100644
--- a/swagger/paths/application/custom_filters/show.yml
+++ b/swagger/paths/application/custom_filters/show.yml
@@ -3,12 +3,24 @@ tags:
 operationId: get-details-of-a-single-custom-filter
 summary: Get a custom filter details
 description: Get the details of a custom filter in the account
+security:
+  - userApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/custom_filter'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/custom_filter'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given team ID does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/custom_filters/update.yml b/swagger/paths/application/custom_filters/update.yml
index a058b81f8..19db632d2 100644
--- a/swagger/paths/application/custom_filters/update.yml
+++ b/swagger/paths/application/custom_filters/update.yml
@@ -2,17 +2,25 @@ tags:
   - Custom Filters
 operationId: update-a-custom-filter
 summary: Update a custom filter
+security:
+  - userApiKey: []
 description: Update a custom filter's attributes
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/custom_filter_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/custom_filter_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/custom_filter'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/custom_filter'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/create.yml b/swagger/paths/application/inboxes/create.yml
index 3d649e820..6f88b0d4a 100644
--- a/swagger/paths/application/inboxes/create.yml
+++ b/swagger/paths/application/inboxes/create.yml
@@ -4,48 +4,32 @@ post:
   operationId: inboxCreation
   summary: Create an inbox
   description: You can create more than one website inbox in each account
+  security:
+    - userApiKey: []
   parameters:
-    - $ref: '#/parameters/account_id'
-    - name: data
-      in: body
-      required: true
-      schema:
-        type: object
-        properties:
-          name:
-            type: string
-            description: The name of the inbox
-          avatar:
-            type: string
-            format: binary
-            description: File for avatar image
-          channel:
-            type: object
-            properties:
-              type:
-                type: string
-                enum: ['web_widget']
-              website_url:
-                type: string
-                description: URL at which the widget will be loaded
-              welcome_title:
-                type: string
-                description: Welcome title to be displayed on the widget
-              welcome_tagline:
-                type: string
-                description: Welcome tagline to be displayed on the widget
-              agent_away_message:
-                type: string
-                description: A message which will be sent if there is not agent available. This is not available if agentbot is connected
-              widget_color:
-                type: string
-                description: A Hex-color string used to customize the widget
+    - $ref: '#/components/parameters/account_id'
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/inbox_create_payload'
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        $ref: '#/definitions/inbox'
-    404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/inbox'
+    '404':
       description: Inbox not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/get_agent_bot.yml b/swagger/paths/application/inboxes/get_agent_bot.yml
index 178151dd3..f10d6b41f 100644
--- a/swagger/paths/application/inboxes/get_agent_bot.yml
+++ b/swagger/paths/application/inboxes/get_agent_bot.yml
@@ -4,19 +4,32 @@ get:
   operationId: getInboxAgentBot
   summary: Show Inbox Agent Bot
   description: See if an agent bot is associated to the Inbox
+  security:
+    - userApiKey: []
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: id
       in: path
-      type: number
+      schema:
+        type: number
       description: ID of the inbox
       required: true
   responses:
-    204:
+    '204':
       description: Success
-      schema:
-        $ref: '#/definitions/agent_bot'
-    404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/agent_bot'
+    '404':
       description: Inbox not found, Agent bot not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/inbox_members/create.yml b/swagger/paths/application/inboxes/inbox_members/create.yml
index 9ca5641e6..1f1396bd3 100644
--- a/swagger/paths/application/inboxes/inbox_members/create.yml
+++ b/swagger/paths/application/inboxes/inbox_members/create.yml
@@ -5,35 +5,51 @@ summary: Add a New Agent
 description: Add a new Agent to Inbox
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
           - inbox_id
           - user_ids
-      properties:
-        inbox_id:
-          type: string
-          description: The ID of the inbox
-        user_ids:
-          type: array
-          items:
+        properties:
+          inbox_id:
             type: integer
-          description: IDs of users to be added to the inbox
+            description: The ID of the inbox
+            example: 1
+          user_ids:
+            type: array
+            items:
+              type: integer
+            description: IDs of users to be added to the inbox
+            example: [1]
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        type: array
-        description: 'Array of all active agents'
-        items:
-          $ref: '#/definitions/agent'
-  404:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all active agents'
+          items:
+            $ref: '#/components/schemas/agent'
+  '404':
     description: Inbox not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
-  422:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '422':
     description: User must exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/inbox_members/delete.yml b/swagger/paths/application/inboxes/inbox_members/delete.yml
index 78f1435b5..a8df7661a 100644
--- a/swagger/paths/application/inboxes/inbox_members/delete.yml
+++ b/swagger/paths/application/inboxes/inbox_members/delete.yml
@@ -5,30 +5,42 @@ summary: Remove an Agent from Inbox
 description: Remove an Agent from Inbox
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - inbox_id
-        - user_ids
-      properties:
-        inbox_id:
-          type: string
-          description: The ID of the inbox
-        user_ids:
-          type: array
-          items:
-            type: integer
-          description: IDs of users to be deleted from the inbox
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - inbox_id
+          - user_ids
+        properties:
+          inbox_id:
+            type: string
+            description: The ID of the inbox
+          user_ids:
+            type: array
+            items:
+              type: integer
+            description: IDs of users to be deleted from the inbox
 responses:
-  200:
+  '200':
     description: Success
-  404:
+  '404':
     description: Inbox not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
-  422:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '422':
     description: User must exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/inbox_members/show.yml b/swagger/paths/application/inboxes/inbox_members/show.yml
index 57793f520..65ec9f969 100644
--- a/swagger/paths/application/inboxes/inbox_members/show.yml
+++ b/swagger/paths/application/inboxes/inbox_members/show.yml
@@ -6,16 +6,26 @@ description: Get Details of Agents in an Inbox
 security:
   - userApiKey: []
 parameters:
-  - $ref: '#/parameters/inbox_id'
+  - $ref: '#/components/parameters/inbox_id'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        type: array
-        description: 'Array of all active agents'
-        items:
-          $ref: '#/definitions/agent'
-  404:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all active agents'
+          items:
+            $ref: '#/components/schemas/agent'
+  '404':
     description: Inbox not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/inbox_members/update.yml b/swagger/paths/application/inboxes/inbox_members/update.yml
index 483b8f6ab..18fc3f2c8 100644
--- a/swagger/paths/application/inboxes/inbox_members/update.yml
+++ b/swagger/paths/application/inboxes/inbox_members/update.yml
@@ -5,35 +5,51 @@ summary: Update Agents in Inbox
 description: All agents except the one passed in params will be removed
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - inbox_id
-        - user_ids
-      properties:
-        inbox_id:
-          type: string
-          description: The ID of the inbox
-        user_ids:
-          type: array
-          items:
-            type: integer
-          description: IDs of users to be added to the inbox
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - inbox_id
+          - user_ids
+        properties:
+          inbox_id:
+            type: string
+            description: The ID of the inbox
+            example: 1
+          user_ids:
+            type: array
+            items:
+              type: integer
+            description: IDs of users to be added to the inbox
+            example: [1]
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        type: array
-        description: 'Array of all active agents'
-        items:
-          $ref: '#/definitions/agent'
-  404:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all active agents'
+          items:
+            $ref: '#/components/schemas/agent'
+  '404':
     description: Inbox not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
-  422:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '422':
     description: User must exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/index.yml b/swagger/paths/application/inboxes/index.yml
index 233488228..7856319ec 100644
--- a/swagger/paths/application/inboxes/index.yml
+++ b/swagger/paths/application/inboxes/index.yml
@@ -4,17 +4,29 @@ get:
   operationId: listAllInboxes
   summary: List all inboxes
   description: List all inboxes available in the current account
+  security:
+    - userApiKey: []
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        type: array
-        description: 'Array of inboxes'
-        items:
-          $ref: '#/definitions/inbox'
-    404:
+      content:
+        application/json:
+          schema:
+            type: array
+            description: 'Array of inboxes'
+            items:
+              $ref: '#/components/schemas/inbox'
+    '404':
       description: Inbox not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/set_agent_bot.yml b/swagger/paths/application/inboxes/set_agent_bot.yml
index 56a37d165..bbd6a9e89 100644
--- a/swagger/paths/application/inboxes/set_agent_bot.yml
+++ b/swagger/paths/application/inboxes/set_agent_bot.yml
@@ -3,29 +3,42 @@ post:
     - Inboxes
   operationId: updateAgentBot
   summary: Add or remove agent bot
+  security:
+    - userApiKey: []
   description: To add an agent bot pass agent_bot id, to remove agent bot from an inbox pass null
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: id
       in: path
-      type: number
+      schema:
+        type: number
       description: ID of the inbox
       required: true
-    - name: data
-      in: body
-      required: true
-      schema:
-        type: object
-        required:
-          - agent_bot
-        properties:
-          agent_bot:
-            type: number
-            description: 'Agent bot ID'
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          type: object
+          required:
+            - agent_bot
+          properties:
+            agent_bot:
+              type: number
+              description: 'Agent bot ID'
+              example: 1
   responses:
-    204:
+    '204':
       description: Success
-    404:
+    '404':
       description: Inbox not found, Agent bot not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/show.yml b/swagger/paths/application/inboxes/show.yml
index 6bb2e84a5..5d145c56e 100644
--- a/swagger/paths/application/inboxes/show.yml
+++ b/swagger/paths/application/inboxes/show.yml
@@ -3,20 +3,33 @@ get:
     - Inboxes
   operationId: GetInbox
   summary: Get an inbox
+  security:
+    - userApiKey: []
   description: Get an inbox available in the current account
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: id
       in: path
-      type: number
+      schema:
+        type: number
       description: ID of the inbox
       required: true
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-          $ref: '#/definitions/inbox'
-    404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/inbox'
+    '404':
       description: Inbox not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/inboxes/update.yml b/swagger/paths/application/inboxes/update.yml
index c5b3aaebf..e076dd532 100644
--- a/swagger/paths/application/inboxes/update.yml
+++ b/swagger/paths/application/inboxes/update.yml
@@ -3,58 +3,41 @@ patch:
     - Inboxes
   operationId: updateInbox
   summary: Update Inbox
-  description: Add avatar and disable auto assignment for an inbox
+  security:
+    - userApiKey: []
+  description: Update an existing inbox
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: id
       in: path
-      type: number
+      schema:
+        type: number
       description: ID of the inbox
       required: true
-    - name: data
-      in: body
-      required: true
-      schema:
-        type: object
-        required:
-          - enable_auto_assignment
-        properties:
-          name:
-            type: string
-            description: The name of the inbox
-          enable_auto_assignment:
-            type: boolean
-            description: 'Enable Auto Assignment'
-          avatar:
-            type: string
-            format: binary
-            description: 'Image file for avatar'
-          channel:
-            type: object
-            properties:
-              website_url:
-                type: string
-                description: URL at which the widget will be loaded
-              welcome_title:
-                type: string
-                description: Welcome title to be displayed on the widget
-              welcome_tagline:
-                type: string
-                description: Welcome tagline to be displayed on the widget
-              agent_away_message:
-                type: string
-                description: A message which will be sent if there is not agent available. This is not available if agentbot is connected
-              widget_color:
-                type: string
-                description: A Hex-color string used to customize the widget
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/inbox_update_payload'
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        type: object
-        description: 'Updated inbox object'
-        $ref: '#/definitions/inbox'
-    404:
+      content:
+        application/json:
+          schema:
+            type: object
+            description: 'Updated inbox object'
+            $ref: '#/components/schemas/inbox'
+    '404':
       description: Inbox not found
-    403:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
+    '403':
       description: Access denied
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/integrations/apps/show.yml b/swagger/paths/application/integrations/apps/show.yml
index 16ce299fe..96fab5b1b 100644
--- a/swagger/paths/application/integrations/apps/show.yml
+++ b/swagger/paths/application/integrations/apps/show.yml
@@ -2,16 +2,28 @@ tags:
   - Integrations
 operationId: get-details-of-all-integrations
 summary: List all the Integrations
+security:
+  - userApiKey: []
 description: Get the details of all Integrations available for the account
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of Integration apps'
-      items:
-        $ref: '#/definitions/integrations_app'
-  401:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of Integration apps'
+          items:
+            $ref: '#/components/schemas/integrations_app'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: Url not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/integrations/hooks/create.yml b/swagger/paths/application/integrations/hooks/create.yml
index 42bcb002e..11d43b140 100644
--- a/swagger/paths/application/integrations/hooks/create.yml
+++ b/swagger/paths/application/integrations/hooks/create.yml
@@ -3,17 +3,26 @@ tags:
 operationId: create-an-integration-hook
 summary: Create an integration hook
 description: Create an integration hook
+security:
+  - userApiKey: []
 parameters:
-  - $ref: '#/parameters/account_id'
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/integrations_hook_create_payload'
+  - $ref: '#/components/parameters/account_id'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/integrations_hook_create_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/integrations_hook'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/integrations_hook'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/integrations/hooks/delete.yml b/swagger/paths/application/integrations/hooks/delete.yml
index 3e616613b..60172b5d8 100644
--- a/swagger/paths/application/integrations/hooks/delete.yml
+++ b/swagger/paths/application/integrations/hooks/delete.yml
@@ -1,15 +1,25 @@
 tags:
-  -  Integrations
+  - Integrations
 operationId: delete-an-integration-hook
 summary: Delete an Integration Hook
 description: Delete an Integration Hook
+security:
+  - userApiKey: []
 parameters:
-  - $ref: '#/parameters/account_id'
-  - $ref: '#/parameters/hook_id'
+  - $ref: '#/components/parameters/account_id'
+  - $ref: '#/components/parameters/hook_id'
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The hook does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/integrations/hooks/update.yml b/swagger/paths/application/integrations/hooks/update.yml
index 2cfd6877a..eaa80cf20 100644
--- a/swagger/paths/application/integrations/hooks/update.yml
+++ b/swagger/paths/application/integrations/hooks/update.yml
@@ -3,18 +3,27 @@ tags:
 operationId: update-an-integrations-hook
 summary: Update an Integration Hook
 description: Update an Integration Hook
+security:
+  - userApiKey: []
 parameters:
-  - $ref: '#/parameters/account_id'
-  - $ref: '#/parameters/hook_id'
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/integrations_hook_update_payload'
+  - $ref: '#/components/parameters/account_id'
+  - $ref: '#/components/parameters/hook_id'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/integrations_hook_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/integrations_hook'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/integrations_hook'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/portal/create.yml b/swagger/paths/application/portal/create.yml
index 187c20008..b08fc2931 100644
--- a/swagger/paths/application/portal/create.yml
+++ b/swagger/paths/application/portal/create.yml
@@ -5,16 +5,22 @@ summary: Add a new portal
 description: Add a new portal to account
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/portal_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/portal_create_update_payload'
 responses:
   '200':
     description: Success
-    schema:
-      $ref: '#/definitions/portal'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/portal'
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/portal/index.yml b/swagger/paths/application/portal/index.yml
index ea56563a4..5cafe09e5 100644
--- a/swagger/paths/application/portal/index.yml
+++ b/swagger/paths/application/portal/index.yml
@@ -3,17 +3,23 @@ tags:
 operationId: get-portal
 summary: List all portals in an account
 parameters:
-  - $ref: '#/parameters/account_id'
+  - $ref: '#/components/parameters/account_id'
 description: Get details of portals in an Account
 security:
   - userApiKey: []
 responses:
   '200':
     description: Success
-    schema:
-      type: array
-      description: Array of all portals
-      items:
-        $ref: '#/definitions/portal'
+    content:
+      application/json:
+        schema:
+          type: array
+          description: Array of all portals
+          items:
+            $ref: '#/components/schemas/portal'
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/portal/update.yml b/swagger/paths/application/portal/update.yml
index 8c6a74e85..5faa170cc 100644
--- a/swagger/paths/application/portal/update.yml
+++ b/swagger/paths/application/portal/update.yml
@@ -1,20 +1,26 @@
 tags:
   - Help Center
-operationId: update-new-portal-to-account
-summary: update a new portal
-description: update a new portal to account
+operationId: update-portal-to-account
+summary: Update a portal
+description: Update a portal to account
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/portal_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/portal_create_update_payload'
 responses:
   '200':
     description: Success
-    schema:
-      $ref: '#/definitions/portal'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/portal'
   '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/reports/conversation/account.yml b/swagger/paths/application/reports/conversation/account.yml
index 28aac72e7..d0fa9a3c3 100644
--- a/swagger/paths/application/reports/conversation/account.yml
+++ b/swagger/paths/application/reports/conversation/account.yml
@@ -2,22 +2,33 @@ tags:
   - Reports
 operationId: get-account-conversation-metrics
 summary: Account Conversation Metrics
+security:
+  - userApiKey: []
 description: Get conversation metrics for Account
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: object
-      description: 'Object of account conversation metrics'
-      properties:
-        open:
-          type: number
-        unattended:
-          type: number
-        unassigned:
-          type: number
-        
-  404:
+    content:
+      application/json:
+        schema:
+          type: object
+          description: 'Object of account conversation metrics'
+          properties:
+            open:
+              type: number
+            unattended:
+              type: number
+            unassigned:
+              type: number
+  '404':
     description: reports not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/reports/conversation/agent.yml b/swagger/paths/application/reports/conversation/agent.yml
index 90f433e4a..3cbf48403 100644
--- a/swagger/paths/application/reports/conversation/agent.yml
+++ b/swagger/paths/application/reports/conversation/agent.yml
@@ -2,17 +2,28 @@ tags:
   - Reports
 operationId: get-agent-conversation-metrics
 summary: Agent Conversation Metrics
+security:
+  - userApiKey: []
 description: Get conversation metrics for Agent
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of agent based conversation metrics'
-      items:
-        $ref: '#/definitions/agent_conversation_metrics'
-        
-  404:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of agent based conversation metrics'
+          items:
+            $ref: '#/components/schemas/agent_conversation_metrics'
+  '404':
     description: reports not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/reports/index.yml b/swagger/paths/application/reports/index.yml
index 3d86df38d..73aca86ea 100644
--- a/swagger/paths/application/reports/index.yml
+++ b/swagger/paths/application/reports/index.yml
@@ -2,21 +2,33 @@ tags:
   - Reports
 operationId: list-all-conversation-statistics
 summary: Get Account reports
+security:
+  - userApiKey: []
 description: Get Account reports for a specific type, metric and date range
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of date based conversation statistics'
-      items:
-        type: object
-        properties:
-          value:
-            type: string
-          timestamp:
-            type: number
-  404:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of date based conversation statistics'
+          items:
+            type: object
+            properties:
+              value:
+                type: string
+              timestamp:
+                type: number
+  '404':
     description: reports not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/reports/summary.yml b/swagger/paths/application/reports/summary.yml
index f9538a9f8..20497cc52 100644
--- a/swagger/paths/application/reports/summary.yml
+++ b/swagger/paths/application/reports/summary.yml
@@ -2,14 +2,26 @@ tags:
   - Reports
 operationId: list-all-conversation-statistics-summary
 summary: Get Account reports summary
+security:
+  - userApiKey: []
 description: Get Account reports summary for a specific type and date range
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      description: 'Object of summary metrics'
-      $ref: '#/definitions/account_summary'
-  404:
+    content:
+      application/json:
+        schema:
+          description: 'Object of summary metrics'
+          $ref: '#/components/schemas/account_summary'
+  '404':
     description: reports not found
-  403:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/team_members/create.yml b/swagger/paths/application/team_members/create.yml
index 724769319..bea148f73 100644
--- a/swagger/paths/application/team_members/create.yml
+++ b/swagger/paths/application/team_members/create.yml
@@ -5,31 +5,46 @@ summary: Add a New Agent
 description: Add a new Agent to Team
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
           - user_ids
-      properties:
-        user_ids:
-          type: array
-          items:
-            type: integer
-          description: IDs of users to be added to the team
+        properties:
+          user_ids:
+            type: array
+            items:
+              type: integer
+            description: IDs of users to be added to the team
+            example: [1]
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        type: array
-        description: 'Array of all active agents'
-        items:
-          $ref: '#/definitions/agent'
-  404:
-    description: Team not found
-  403:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all active agents'
+          items:
+            $ref: '#/components/schemas/agent'
+  '403':
     description: Access denied
-  422:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Team not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '422':
     description: User must exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/team_members/delete.yml b/swagger/paths/application/team_members/delete.yml
index ac7dbb451..99deed83d 100644
--- a/swagger/paths/application/team_members/delete.yml
+++ b/swagger/paths/application/team_members/delete.yml
@@ -5,27 +5,38 @@ summary: Remove an Agent from Team
 description: Remove an Agent from Team
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - team_id
-        - user_ids
-      properties:
-        user_ids:
-          type: array
-          items:
-            type: integer
-          description: IDs of users to be deleted from the team
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - user_ids
+        properties:
+          user_ids:
+            type: array
+            items:
+              type: integer
+            description: IDs of users to be deleted from the team
 responses:
-  200:
+  '200':
     description: Success
-  404:
-    description: Team not found
-  403:
+  '403':
     description: Access denied
-  422:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Team not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '422':
     description: User must exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/team_members/index.yml b/swagger/paths/application/team_members/index.yml
index c57705223..dfa505363 100644
--- a/swagger/paths/application/team_members/index.yml
+++ b/swagger/paths/application/team_members/index.yml
@@ -6,17 +6,27 @@ description: Get Details of Agents in an Team
 security:
   - userApiKey: []
 parameters:
-  - $ref: '#/parameters/account_id'
-  - $ref: '#/parameters/team_id'
+  - $ref: '#/components/parameters/account_id'
+  - $ref: '#/components/parameters/team_id'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        type: array
-        description: 'Array of all agents in the team'
-        items:
-          $ref: '#/definitions/agent'
-  404:
-    description: Inbox not found
-  403:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all agents in the team'
+          items:
+            $ref: '#/components/schemas/agent'
+  '403':
     description: Access denied
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Team not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/team_members/update.yml b/swagger/paths/application/team_members/update.yml
index 81034b9c7..34a2de82f 100644
--- a/swagger/paths/application/team_members/update.yml
+++ b/swagger/paths/application/team_members/update.yml
@@ -5,31 +5,46 @@ summary: Update Agents in Team
 description: All agents except the one passed in params will be removed
 security:
   - userApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - user_ids
-      properties:
-        user_ids:
-          type: array
-          items:
-            type: integer
-          description: IDs of users to be added to the team
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - user_ids
+        properties:
+          user_ids:
+            type: array
+            items:
+              type: integer
+            description: IDs of users to be added to the team
+            example: [1]
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-        type: array
-        description: 'Array of all agents in the team'
-        items:
-          $ref: '#/definitions/agent'
-  404:
-    description: Team not found
-  403:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of all agents in the team'
+          items:
+            $ref: '#/components/schemas/agent'
+  '403':
     description: Access denied
-  422:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: Team not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '422':
     description: User must exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/teams/create.yml b/swagger/paths/application/teams/create.yml
index 2ec066738..b96068b11 100644
--- a/swagger/paths/application/teams/create.yml
+++ b/swagger/paths/application/teams/create.yml
@@ -2,18 +2,27 @@ tags:
   - Teams
 operationId: create-a-team
 summary: Create a team
+security:
+  - userApiKey: []
 description: Create a team in the account
 parameters:
-  - $ref: '#/parameters/account_id'
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/team_create_update_payload'
+  - $ref: '#/components/parameters/account_id'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/team_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/team'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/team'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/teams/delete.yml b/swagger/paths/application/teams/delete.yml
index 7c5698b99..eae30ecba 100644
--- a/swagger/paths/application/teams/delete.yml
+++ b/swagger/paths/application/teams/delete.yml
@@ -2,11 +2,21 @@ tags:
   - Teams
 operationId: delete-a-team
 summary: Delete a team
+security:
+  - userApiKey: []
 description: Delete a team from the account
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The team does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/teams/index.yml b/swagger/paths/application/teams/index.yml
index f93b6a553..85ac0ff8f 100644
--- a/swagger/paths/application/teams/index.yml
+++ b/swagger/paths/application/teams/index.yml
@@ -2,14 +2,22 @@ tags:
   - Teams
 operationId: list-all-teams
 summary: List all teams
+security:
+  - userApiKey: []
 description: List all teams available in the current account
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of teams'
-      items:
-        $ref: '#/definitions/team'
-  401:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of teams'
+          items:
+            $ref: '#/components/schemas/team'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/teams/show.yml b/swagger/paths/application/teams/show.yml
index 485b4730b..15869beda 100644
--- a/swagger/paths/application/teams/show.yml
+++ b/swagger/paths/application/teams/show.yml
@@ -2,13 +2,25 @@ tags:
   - Teams
 operationId: get-details-of-a-single-team
 summary: Get a team details
+security:
+  - userApiKey: []
 description: Get the details of a team in the account
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/team'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/team'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given team ID does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/teams/update.yml b/swagger/paths/application/teams/update.yml
index 8afeddc02..5b620e888 100644
--- a/swagger/paths/application/teams/update.yml
+++ b/swagger/paths/application/teams/update.yml
@@ -2,17 +2,25 @@ tags:
   - Teams
 operationId: update-a-team
 summary: Update a team
+security:
+  - userApiKey: []
 description: Update a team's attributes
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/team_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/team_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/team'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/team'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/webhooks/create.yml b/swagger/paths/application/webhooks/create.yml
index e4d3053ee..81d7bbf1a 100644
--- a/swagger/paths/application/webhooks/create.yml
+++ b/swagger/paths/application/webhooks/create.yml
@@ -2,18 +2,27 @@ tags:
   - Webhooks
 operationId: create-a-webhook
 summary: Add a webhook
+security:
+  - userApiKey: []
 description: Add a webhook subscription to the account
 parameters:
-  - $ref: '#/parameters/account_id'
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/webhook_create_update_payload'
+  - $ref: '#/components/parameters/account_id'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/webhook_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/webhook'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/webhook'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/webhooks/delete.yml b/swagger/paths/application/webhooks/delete.yml
index 525c22dfc..07cfdbaf8 100644
--- a/swagger/paths/application/webhooks/delete.yml
+++ b/swagger/paths/application/webhooks/delete.yml
@@ -2,11 +2,21 @@ tags:
   - Webhooks
 operationId: delete-a-webhook
 summary: Delete a webhook
+security:
+  - userApiKey: []
 description: Delete a webhook from the account
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          type: object
+  '404':
     description: The webhook does not exist in the account
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/webhooks/index.yml b/swagger/paths/application/webhooks/index.yml
index f96fa00de..d385a9ad1 100644
--- a/swagger/paths/application/webhooks/index.yml
+++ b/swagger/paths/application/webhooks/index.yml
@@ -2,14 +2,22 @@ tags:
   - Webhooks
 operationId: list-all-webhooks
 summary: List all webhooks
-description:  List all webhooks in the account
+security:
+  - userApiKey: []
+description: List all webhooks in the account
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of webhook objects'
-      items:
-        $ref: '#/definitions/webhook'
-  401:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of webhook objects'
+          items:
+            $ref: '#/components/schemas/webhook'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/application/webhooks/update.yml b/swagger/paths/application/webhooks/update.yml
index b395e7362..5e6a36782 100644
--- a/swagger/paths/application/webhooks/update.yml
+++ b/swagger/paths/application/webhooks/update.yml
@@ -2,18 +2,27 @@ tags:
   - Webhooks
 operationId: update-a-webhook
 summary: Update a webhook object
+security:
+  - userApiKey: []
 description: Update a webhook object in the account
 parameters:
-  - $ref: '#/parameters/account_id'
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/webhook_create_update_payload'
+  - $ref: '#/components/parameters/account_id'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/webhook_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/webhook'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/webhook'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 769f38c27..1753d38b3 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -7,7 +7,7 @@
     $ref: ./platform/accounts/create.yml
 /platform/api/v1/accounts/{account_id}:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: './platform/accounts/show.yml'
   patch:
@@ -15,12 +15,11 @@
   delete:
     $ref: ./platform/accounts/delete.yml
 
-
 # Account Users
 
 /platform/api/v1/accounts/{account_id}/account_users:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: './platform/account_users/index.yml'
   post:
@@ -37,7 +36,7 @@
     $ref: ./platform/agent_bots/create.yml
 /platform/api/v1/agent_bots/{id}:
   parameters:
-    - $ref: '#/parameters/agent_bot_id'
+    - $ref: '#/components/parameters/agent_bot_id'
   get:
     $ref: './platform/agent_bots/show.yml'
   patch:
@@ -52,7 +51,7 @@
     $ref: ./platform/users/create.yml
 /platform/api/v1/users/{id}:
   parameters:
-    - $ref: '#/parameters/platform_user_id'
+    - $ref: '#/components/parameters/platform_user_id'
   get:
     $ref: './platform/users/show.yml'
   patch:
@@ -61,11 +60,10 @@
     $ref: ./platform/users/delete.yml
 /platform/api/v1/users/{id}/login:
   parameters:
-    - $ref: '#/parameters/platform_user_id'
+    - $ref: '#/components/parameters/platform_user_id'
   get:
     $ref: './platform/users/login.yml'
 
-
 # ---------------- end of platform path -----------#
 
 # ------------  Public API routes  ------------#
@@ -74,7 +72,7 @@
 
 /public/api/v1/inboxes/{inbox_identifier}:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_inbox_identifier'
   get:
     $ref: './public/inboxes/show.yml'
 
@@ -82,13 +80,13 @@
 
 /public/api/v1/inboxes/{inbox_identifier}/contacts:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_inbox_identifier'
   post:
     $ref: ./public/inboxes/contacts/create.yml
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
-    - $ref: '#/parameters/public_contact_identifier'
+    - $ref: '#/components/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_contact_identifier'
   get:
     $ref: './public/inboxes/contacts/show.yml'
   patch:
@@ -96,8 +94,8 @@
 
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
-    - $ref: '#/parameters/public_contact_identifier'
+    - $ref: '#/components/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_contact_identifier'
   post:
     $ref: ./public/inboxes/conversations/create.yml
   get:
@@ -105,61 +103,54 @@
 
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
-    - $ref: '#/parameters/public_contact_identifier'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_contact_identifier'
+    - $ref: '#/components/parameters/conversation_id'
   get:
     $ref: ./public/inboxes/conversations/show.yml
 
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/toggle_status:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
-    - $ref: '#/parameters/public_contact_identifier'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_contact_identifier'
+    - $ref: '#/components/parameters/conversation_id'
   post:
     $ref: ./public/inboxes/conversations/toggle_status.yml
 
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/toggle_typing:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
-    - $ref: '#/parameters/public_contact_identifier'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_contact_identifier'
+    - $ref: '#/components/parameters/conversation_id'
   post:
     $ref: ./public/inboxes/conversations/toggle_typing.yml
 
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/update_last_seen:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
-    - $ref: '#/parameters/public_contact_identifier'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_contact_identifier'
+    - $ref: '#/components/parameters/conversation_id'
   post:
     $ref: ./public/inboxes/conversations/update_last_seen.yml
 
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/messages:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
-    - $ref: '#/parameters/public_contact_identifier'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_contact_identifier'
+    - $ref: '#/components/parameters/conversation_id'
   post:
     $ref: ./public/inboxes/messages/create.yml
   get:
     $ref: ./public/inboxes/messages/index.yml
+
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/messages/{message_id}:
   parameters:
-    - $ref: '#/parameters/public_inbox_identifier'
-    - $ref: '#/parameters/public_contact_identifier'
-    - $ref: '#/parameters/conversation_id'
-    - $ref: '#/parameters/message_id'
+    - $ref: '#/components/parameters/public_inbox_identifier'
+    - $ref: '#/components/parameters/public_contact_identifier'
+    - $ref: '#/components/parameters/conversation_id'
+    - $ref: '#/components/parameters/message_id'
   patch:
     $ref: ./public/inboxes/messages/update.yml
-/api/v1/accounts/{account_id}/contacts/{contact_identifier}/labels:
-  parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/public_contact_identifier'
-  get:
-    $ref: ./application/contacts/labels/index.yml
-  post:
-    $ref: ./application/contacts/labels/create.yml
 
 # ---------------- end of public api routes-----------#
 
@@ -167,7 +158,7 @@
 
 /survey/responses/{conversation_uuid}:
   parameters:
-    - $ref: '#/parameters/conversation_uuid'
+    - $ref: '#/components/parameters/conversation_uuid'
   get:
     $ref: ./survey/show.yml
 
@@ -175,19 +166,18 @@
 
 # ------------  Application API routes  ------------#
 
-
 # AgentBots
 /api/v1/accounts/{account_id}/agent_bots:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: ./application/agent_bots/index.yml
   post:
     $ref: ./application/agent_bots/create.yml
 /api/v1/accounts/{account_id}/agent_bots/{id}:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/agent_bot_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/agent_bot_id'
   get:
     $ref: './application/agent_bots/show.yml'
   patch:
@@ -198,14 +188,14 @@
 # Agents
 /api/v1/accounts/{account_id}/agents:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: ./application/agents/index.yml
   post:
     $ref: ./application/agents/create.yml
 /api/v1/accounts/{account_id}/agents/{id}:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   patch:
     $ref: ./application/agents/update.yml
   delete:
@@ -214,14 +204,14 @@
 # Canned Responses
 /api/v1/accounts/{account_id}/canned_responses:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: ./application/canned_responses/index.yml
   post:
     $ref: ./application/canned_responses/create.yml
 /api/v1/accounts/{account_id}/canned_responses/{id}:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   patch:
     $ref: ./application/canned_responses/update.yml
   delete:
@@ -230,17 +220,18 @@
 # Custom Attributes
 /api/v1/accounts/{account_id}/custom_attribute_definitions:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: ./application/custom_attributes/index.yml
   post:
     $ref: ./application/custom_attributes/create.yml
 /api/v1/accounts/{account_id}/custom_attribute_definitions/{id}:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: id
       in: path
-      type: number
+      schema:
+        type: number
       description: ID of the custom attribute
       required: true
   get:
@@ -257,13 +248,12 @@
   $ref: ./application/contacts/crud.yml
 /api/v1/accounts/{account_id}/contacts/{id}/conversations:
   $ref: ./application/contacts/conversations.yml
+/api/v1/accounts/{account_id}/contacts/{id}/labels:
+  $ref: ./application/contacts/labels.yml
 /api/v1/accounts/{account_id}/contacts/search:
   $ref: ./application/contacts/search.yml
 /api/v1/accounts/{account_id}/contacts/filter:
-  parameters:
-    - $ref: '#/parameters/account_id'
-  post:
-    $ref: ./application/contacts/filter.yml
+  $ref: ./application/contacts/filter.yml
 /api/v1/accounts/{account_id}/contacts/{id}/contact_inboxes:
   $ref: ./application/contact_inboxes/create.yml
 /api/v1/accounts/{account_id}/contacts/{id}/contactable_inboxes:
@@ -273,17 +263,18 @@
 # Automation Rule
 /api/v1/accounts/{account_id}/automation_rules:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: ./application/automation_rule/index.yml
   post:
     $ref: ./application/automation_rule/create.yml
 /api/v1/accounts/{account_id}/automation_rules/{id}:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - name: id
       in: path
-      type: number
+      schema:
+        type: number
       description: ID of the Automation Rule
       required: true
   get:
@@ -293,36 +284,37 @@
   delete:
     $ref: ./application/automation_rule/delete.yml
 
-
 # Help Center
 /api/v1/accounts/{account_id}/portals:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   post:
     $ref: ./application/portal/create.yml
   get:
     $ref: ./application/portal/index.yml
+/api/v1/accounts/{account_id}/portals/{id}:
+  parameters:
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/portal_id'
   patch:
     $ref: ./application/portal/update.yml
 
-
 # Help Center category
-/api/v1/accounts/{account_id}/portals/{portal_id}/categories:
+/api/v1/accounts/{account_id}/portals/{id}/categories:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/portal_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/portal_id'
   post:
     $ref: ./application/category/create.yml
 
 # Help Center article
-/api/v1/accounts/{account_id}/portals/{portal_id}/articles:
+/api/v1/accounts/{account_id}/portals/{id}/articles:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/portal_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/portal_id'
   post:
     $ref: ./application/article/create.yml
 
-
 # Conversations
 /api/v1/accounts/{account_id}/conversations/meta:
   $ref: ./application/conversation/meta.yml
@@ -330,34 +322,34 @@
   $ref: ./application/conversation/index.yml
 /api/v1/accounts/{account_id}/conversations/filter:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   post:
     $ref: ./application/conversation/filter.yml
 /api/v1/accounts/{account_id}/conversations/{conversation_id}:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
   get:
     $ref: ./application/conversation/show.yml
   patch:
     $ref: ./application/conversation/update.yml
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_status:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
   post:
     $ref: ./application/conversation/toggle_status.yml
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_priority:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
   post:
     $ref: ./application/conversation/toggle_priority.yml
 
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/custom_attributes:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
   post:
     $ref: ./application/conversation/custom_attributes.yml
 
@@ -365,8 +357,8 @@
 
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/assignments:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
   post:
     $ref: ./application/conversation/assignments.yml
 
@@ -374,14 +366,13 @@
 
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/labels:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
   get:
     $ref: ./application/conversation/labels/index.yml
   post:
     $ref: ./application/conversation/labels/create.yml
 
-
 # Inboxes
 /api/v1/accounts/{account_id}/inboxes:
   $ref: ./application/inboxes/index.yml
@@ -399,14 +390,14 @@
 # Inbox Members
 /api/v1/accounts/{account_id}/inbox_members/{inbox_id}:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/inbox_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/inbox_id'
   get:
     $ref: ./application/inboxes/inbox_members/show.yml
 
 /api/v1/accounts/{account_id}/inbox_members:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   post:
     $ref: ./application/inboxes/inbox_members/create.yml
   patch:
@@ -414,31 +405,27 @@
   delete:
     $ref: ./application/inboxes/inbox_members/delete.yml
 
-
-
 # Messages
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/messages:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
   get:
     $ref: ./application/conversation/messages/index.yml
   post:
     $ref: ./application/conversation/messages/create.yml
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/messages/{message_id}:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
-    - $ref: '#/parameters/message_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/conversation_id'
+    - $ref: '#/components/parameters/message_id'
   delete:
     $ref: ./application/conversation/messages/delete.yml
 
-
-
 # Integrations
 /api/v1/accounts/{account_id}/integrations/apps:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: './application/integrations/apps/show.yml'
 /api/v1/accounts/{account_id}/integrations/hooks:
@@ -450,25 +437,22 @@
   delete:
     $ref: ./application/integrations/hooks/delete.yml
 
-
-
 # Profile
 /api/v1/profile:
   $ref: ./profile/index.yml
 
-
 # Teams
 /api/v1/accounts/{account_id}/teams:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: ./application/teams/index.yml
   post:
     $ref: ./application/teams/create.yml
 /api/v1/accounts/{account_id}/teams/{team_id}:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/team_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/team_id'
   get:
     $ref: './application/teams/show.yml'
   patch:
@@ -477,8 +461,8 @@
     $ref: ./application/teams/delete.yml
 /api/v1/accounts/{account_id}/teams/{team_id}/team_members:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/team_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/team_id'
   get:
     $ref: ./application/team_members/index.yml
   post:
@@ -493,11 +477,12 @@
 # Custom Filters
 /api/v1/accounts/{account_id}/custom_filters:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - in: query
       name: filter_type
-      type: string
-      enum: ['conversation', 'contact', 'report']
+      schema:
+        type: string
+        enum: ['conversation', 'contact', 'report']
       required: false
       description: The type of custom filter
   get:
@@ -506,8 +491,8 @@
     $ref: ./application/custom_filters/create.yml
 /api/v1/accounts/{account_id}/custom_filters/{custom_filter_id}:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/custom_filter_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/custom_filter_id'
   get:
     $ref: './application/custom_filters/show.yml'
   patch:
@@ -518,15 +503,15 @@
 # webhooks
 /api/v1/accounts/{account_id}/webhooks:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
   get:
     $ref: ./application/webhooks/index.yml
   post:
     $ref: ./application/webhooks/create.yml
 /api/v1/accounts/{account_id}/webhooks/{webhook_id}:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/webhook_id'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/webhook_id'
   patch:
     $ref: ./application/webhooks/update.yml
   delete:
@@ -537,20 +522,23 @@
 # List
 /api/v2/accounts/{account_id}/reports:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/report_metric'
-    - $ref: '#/parameters/report_type'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/report_metric'
+    - $ref: '#/components/parameters/report_type'
     - in: query
       name: id
-      type: string
+      schema:
+        type: string
       description: The Id of specific object in case of agent/inbox/label
     - in: query
       name: since
-      type: string
+      schema:
+        type: string
       description: The timestamp from where report should start.
     - in: query
       name: until
-      type: string
+      schema:
+        type: string
       description: The timestamp from where report should stop.
   get:
     $ref: './application/reports/index.yml'
@@ -558,19 +546,22 @@
 # Summary
 /api/v2/accounts/{account_id}/reports/summary:
   parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/report_type'
+    - $ref: '#/components/parameters/account_id'
+    - $ref: '#/components/parameters/report_type'
     - in: query
       name: id
-      type: string
+      schema:
+        type: string
       description: The Id of specific object in case of agent/inbox/label
     - in: query
       name: since
-      type: string
+      schema:
+        type: string
       description: The timestamp from where report should start.
     - in: query
       name: until
-      type: string
+      schema:
+        type: string
       description: The timestamp from where report should stop.
   get:
     $ref: './application/reports/summary.yml'
@@ -578,12 +569,13 @@
 # Conversation metrics for account
 /api/v2/accounts/{account_id}/reports/conversations:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - in: query
       name: type
-      type: string
-      enum:
-        - account
+      schema:
+        type: string
+        enum:
+          - account
       required: true
       description: Type of report
   get:
@@ -592,17 +584,19 @@
 # Conversation metrics for agent
 /api/v2/accounts/{account_id}/reports/conversations/:
   parameters:
-    - $ref: '#/parameters/account_id'
+    - $ref: '#/components/parameters/account_id'
     - in: query
       name: type
-      type: string
-      enum:
-        - agent
+      schema:
+        type: string
+        enum:
+          - agent
       required: true
       description: Type of report
     - in: query
       name: user_id
-      type: string
+      schema:
+        type: string
       description: The numeric ID of the user
   get:
     $ref: './application/reports/conversation/agent.yml'
diff --git a/swagger/paths/platform/account_users/create.yml b/swagger/paths/platform/account_users/create.yml
index 97dc7127d..69d7c4b98 100644
--- a/swagger/paths/platform/account_users/create.yml
+++ b/swagger/paths/platform/account_users/create.yml
@@ -5,37 +5,33 @@ summary: Create an Account User
 description: Create an Account User
 security:
   - platformAppApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - user_id
-        - role
-      properties: 
-        user_id:
-          type: integer
-          description: The ID of the user
-        role:
-          type: string
-          description: whether user is an administrator or agent
-      
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/account_user_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      properties: 
-        account_id:
-          type: integer
-          description: The ID of the user
-        user_id:
-          type: integer
-          description: The ID of the user
-        role:
-          type: string
-          description: whether user is an administrator or agent
-      
-  401:
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            account_id:
+              type: integer
+              description: The ID of the account
+            user_id:
+              type: integer
+              description: The ID of the user
+            role:
+              type: string
+              description: whether user is an administrator or agent
+
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/account_users/delete.yml b/swagger/paths/platform/account_users/delete.yml
index d864619f7..f2fc35535 100644
--- a/swagger/paths/platform/account_users/delete.yml
+++ b/swagger/paths/platform/account_users/delete.yml
@@ -5,23 +5,18 @@ summary: Delete an Account User
 description: Delete an Account User
 security:
   - platformAppApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      type: object
-      required:
-        - user_id
-      properties: 
-        user_id:
-          type: integer
-          description: The ID of the user
-
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The account does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/account_users/index.yml b/swagger/paths/platform/account_users/index.yml
index bcaed1807..dfcdded99 100644
--- a/swagger/paths/platform/account_users/index.yml
+++ b/swagger/paths/platform/account_users/index.yml
@@ -6,23 +6,15 @@ description: List all account users
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of account users'
-      items:
-        type: object
-        properties: 
-          account_id:
-            type: integer
-            description: The ID of the user
-          user_id:
-            type: integer
-            description: The ID of the user
-          role:
-            type: string
-            description: whether user is an administrator or agent
-      
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/account_user'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/accounts/create.yml b/swagger/paths/platform/accounts/create.yml
index a6e9841b9..a8ea455f5 100644
--- a/swagger/paths/platform/accounts/create.yml
+++ b/swagger/paths/platform/accounts/create.yml
@@ -5,16 +5,22 @@ summary: Create an Account
 description: Create an Account
 security:
   - platformAppApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/account_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/account_create_update_payload'
 responses:
   200:
     description: Success
-    schema:
-      $ref: '#/definitions/platform_account'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/platform_account'
   401:
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/accounts/delete.yml b/swagger/paths/platform/accounts/delete.yml
index 755b76d1e..d7e25795b 100644
--- a/swagger/paths/platform/accounts/delete.yml
+++ b/swagger/paths/platform/accounts/delete.yml
@@ -6,9 +6,17 @@ description: Delete an Account
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The account does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/accounts/show.yml b/swagger/paths/platform/accounts/show.yml
index d8ec94fe6..1df201701 100644
--- a/swagger/paths/platform/accounts/show.yml
+++ b/swagger/paths/platform/accounts/show.yml
@@ -6,11 +6,21 @@ description: Get the details of an account
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/platform_account'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/platform_account'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given account does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/accounts/update.yml b/swagger/paths/platform/accounts/update.yml
index a70ce9468..a30caea1f 100644
--- a/swagger/paths/platform/accounts/update.yml
+++ b/swagger/paths/platform/accounts/update.yml
@@ -5,16 +5,22 @@ summary: Update an account
 description: Update an account's attributes
 security:
   - platformAppApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/account_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/account_create_update_payload'
 responses:
   200:
     description: Success
-    schema:
-      $ref: '#/definitions/platform_account'
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/platform_account'
   401:
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/agent_bots/create.yml b/swagger/paths/platform/agent_bots/create.yml
index a862ca131..4f916d672 100644
--- a/swagger/paths/platform/agent_bots/create.yml
+++ b/swagger/paths/platform/agent_bots/create.yml
@@ -5,16 +5,22 @@ summary: Create an Agent Bot
 description: Create an agent bot
 security:
   - platformAppApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/agent_bot_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/platform_agent_bot_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/agent_bot'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/agent_bot'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/agent_bots/delete.yml b/swagger/paths/platform/agent_bots/delete.yml
index 676c8f525..a89fed307 100644
--- a/swagger/paths/platform/agent_bots/delete.yml
+++ b/swagger/paths/platform/agent_bots/delete.yml
@@ -6,9 +6,17 @@ description: Delete an AgentBot
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The agent bot does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/agent_bots/index.yml b/swagger/paths/platform/agent_bots/index.yml
index 7ef3ee9c9..054085471 100644
--- a/swagger/paths/platform/agent_bots/index.yml
+++ b/swagger/paths/platform/agent_bots/index.yml
@@ -6,12 +6,18 @@ description: List all agent bots available
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of agent bots'
-      items:
-        $ref: '#/definitions/agent_bot'
-  401:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of agent bots'
+          items:
+            $ref: '#/components/schemas/agent_bot'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/agent_bots/show.yml b/swagger/paths/platform/agent_bots/show.yml
index dfbd43a27..d0a8ba37c 100644
--- a/swagger/paths/platform/agent_bots/show.yml
+++ b/swagger/paths/platform/agent_bots/show.yml
@@ -6,11 +6,21 @@ description: Get the details of an agent bot
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/agent_bot'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/agent_bot'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given agent bot ID does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/agent_bots/update.yml b/swagger/paths/platform/agent_bots/update.yml
index 842b4854d..7abc46ab8 100644
--- a/swagger/paths/platform/agent_bots/update.yml
+++ b/swagger/paths/platform/agent_bots/update.yml
@@ -5,16 +5,22 @@ summary: Update an agent bot
 description: Update an agent bot's attributes
 security:
   - platformAppApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/agent_bot_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/platform_agent_bot_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/agent_bot'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/agent_bot'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/users/create.yml b/swagger/paths/platform/users/create.yml
index 7433b8dc6..3d2bdb412 100644
--- a/swagger/paths/platform/users/create.yml
+++ b/swagger/paths/platform/users/create.yml
@@ -5,16 +5,22 @@ summary: Create a User
 description: Create a User
 security:
   - platformAppApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/user_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/user_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/user'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/user'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/users/delete.yml b/swagger/paths/platform/users/delete.yml
index a7658c215..d26e9d285 100644
--- a/swagger/paths/platform/users/delete.yml
+++ b/swagger/paths/platform/users/delete.yml
@@ -6,9 +6,17 @@ description: Delete a User
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The user does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/users/login.yml b/swagger/paths/platform/users/login.yml
index be210c7aa..9e327e745 100644
--- a/swagger/paths/platform/users/login.yml
+++ b/swagger/paths/platform/users/login.yml
@@ -6,15 +6,25 @@ description: Get the sso link of a user
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: object
-      properties:
-        url:
-          type: string
-          description: SSO url to autenticate the user
-  401:
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            url:
+              type: string
+              description: SSO url to autenticate the user
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given user does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/users/show.yml b/swagger/paths/platform/users/show.yml
index bf937b49a..e42b3854e 100644
--- a/swagger/paths/platform/users/show.yml
+++ b/swagger/paths/platform/users/show.yml
@@ -6,11 +6,21 @@ description: Get the details of an user
 security:
   - platformAppApiKey: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/user'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/user'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given user does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/platform/users/update.yml b/swagger/paths/platform/users/update.yml
index 56ea0026d..f340448da 100644
--- a/swagger/paths/platform/users/update.yml
+++ b/swagger/paths/platform/users/update.yml
@@ -5,16 +5,22 @@ summary: Update a user
 description: Update a user's attributes
 security:
   - platformAppApiKey: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/user_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/user_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/user'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/user'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/profile/index.yml b/swagger/paths/profile/index.yml
index e20004cac..17eda92d0 100644
--- a/swagger/paths/profile/index.yml
+++ b/swagger/paths/profile/index.yml
@@ -4,10 +4,18 @@ get:
   operationId: fetchProfile
   summary: Fetch user profile
   description: Get the user profile details
+  security:
+    - userApiKey: []
   responses:
-    200:
+    '200':
       description: Success
-      schema:
-        $ref: '#/definitions/user'
-    401:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/user'
+    '401':
       description: Unauthorized
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/contacts/create.yml b/swagger/paths/public/inboxes/contacts/create.yml
index 51d894f3e..4e8d1f6eb 100644
--- a/swagger/paths/public/inboxes/contacts/create.yml
+++ b/swagger/paths/public/inboxes/contacts/create.yml
@@ -4,16 +4,22 @@ operationId: create-a-contact
 summary: Create a contact
 description: Create a contact
 security: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/public_contact_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/public_contact_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/public_contact'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_contact'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/contacts/show.yml b/swagger/paths/public/inboxes/contacts/show.yml
index a5d8b8fdc..49039266a 100644
--- a/swagger/paths/public/inboxes/contacts/show.yml
+++ b/swagger/paths/public/inboxes/contacts/show.yml
@@ -5,11 +5,21 @@ summary: Get a contact
 description: Get the details of a contact
 security: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/public_contact'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_contact'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given contact does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/contacts/update.yml b/swagger/paths/public/inboxes/contacts/update.yml
index a413c76b3..8134d7bfd 100644
--- a/swagger/paths/public/inboxes/contacts/update.yml
+++ b/swagger/paths/public/inboxes/contacts/update.yml
@@ -4,16 +4,22 @@ operationId: update-a-contact
 summary: Update a contact
 description: Update a contact's attributes
 security: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/public_contact_create_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/public_contact_create_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/public_contact'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_contact'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/conversations/create.yml b/swagger/paths/public/inboxes/conversations/create.yml
index 4c2a85d22..31bd9ac86 100644
--- a/swagger/paths/public/inboxes/conversations/create.yml
+++ b/swagger/paths/public/inboxes/conversations/create.yml
@@ -4,16 +4,22 @@ operationId: create-a-conversation
 summary: Create a conversation
 description: Create a conversation
 security: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/public_conversation_create_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/public_conversation_create_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/public_conversation'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_conversation'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/conversations/index.yml b/swagger/paths/public/inboxes/conversations/index.yml
index bcd598758..3bfc89873 100644
--- a/swagger/paths/public/inboxes/conversations/index.yml
+++ b/swagger/paths/public/inboxes/conversations/index.yml
@@ -3,13 +3,20 @@ tags:
 operationId: list-all-contact-conversations
 summary: List all conversations
 description: List all conversations for the contact
+security: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of conversations'
-      items:
-        $ref: '#/definitions/public_conversation'
-  401:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of conversations'
+          items:
+            $ref: '#/components/schemas/public_conversation'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/conversations/show.yml b/swagger/paths/public/inboxes/conversations/show.yml
index 2ec6caa63..320457c48 100644
--- a/swagger/paths/public/inboxes/conversations/show.yml
+++ b/swagger/paths/public/inboxes/conversations/show.yml
@@ -3,12 +3,23 @@ tags:
 operationId: get-single-conversation
 summary: Get a single conversation
 description: Retrieves the details of a specific conversation
+security: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/public_conversation'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_conversation'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/conversations/toggle_status.yml b/swagger/paths/public/inboxes/conversations/toggle_status.yml
index cac1c3d8d..bfbd41c70 100644
--- a/swagger/paths/public/inboxes/conversations/toggle_status.yml
+++ b/swagger/paths/public/inboxes/conversations/toggle_status.yml
@@ -3,12 +3,23 @@ tags:
 operationId: resolve-conversation
 summary: Resolve a conversation
 description: Marks a conversation as resolved
+security: []
 responses:
-  200:
+  '200':
     description: Conversation resolved successfully
-    schema:
-      $ref: '#/definitions/public_conversation'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_conversation'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/conversations/toggle_typing.yml b/swagger/paths/public/inboxes/conversations/toggle_typing.yml
index af01c77f6..603ed0f8d 100644
--- a/swagger/paths/public/inboxes/conversations/toggle_typing.yml
+++ b/swagger/paths/public/inboxes/conversations/toggle_typing.yml
@@ -3,16 +3,38 @@ tags:
 operationId: toggle-typing-status
 summary: Toggle typing status
 description: Toggles the typing status in a conversation
+security: []
 parameters:
   - name: typing_status
     in: query
     required: true
-    type: string
+    schema:
+      type: string
     description: Typing status, either 'on' or 'off'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        properties:
+          typing_status:
+            type: string
+            enum: ['on', 'off']
+            description: The typing status to set
+            example: 'on'
 responses:
-  200:
+  '200':
     description: Typing status toggled successfully
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/conversations/update_last_seen.yml b/swagger/paths/public/inboxes/conversations/update_last_seen.yml
index 4e56aa11d..a3e199e73 100644
--- a/swagger/paths/public/inboxes/conversations/update_last_seen.yml
+++ b/swagger/paths/public/inboxes/conversations/update_last_seen.yml
@@ -3,10 +3,19 @@ tags:
 operationId: update-last-seen
 summary: Update last seen
 description: Updates the last seen time of the contact in a conversation
+security: []
 responses:
-  200:
+  '200':
     description: Last seen updated successfully
-  401:
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: Conversation not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/messages/create.yml b/swagger/paths/public/inboxes/messages/create.yml
index 902090952..1afa7d731 100644
--- a/swagger/paths/public/inboxes/messages/create.yml
+++ b/swagger/paths/public/inboxes/messages/create.yml
@@ -4,16 +4,22 @@ operationId: create-a-message
 summary: Create a message
 description: Create a message
 security: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/public_message_create_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/public_message_create_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/public_message'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_message'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/messages/index.yml b/swagger/paths/public/inboxes/messages/index.yml
index 0c9eaeab3..68e34fed7 100644
--- a/swagger/paths/public/inboxes/messages/index.yml
+++ b/swagger/paths/public/inboxes/messages/index.yml
@@ -3,13 +3,20 @@ tags:
 operationId: list-all-converation-messages
 summary: List all messages
 description: List all messages in the conversation
+security: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      type: array
-      description: 'Array of messages'
-      items:
-        $ref: '#/definitions/public_message'
-  401:
+    content:
+      application/json:
+        schema:
+          type: array
+          description: 'Array of messages'
+          items:
+            $ref: '#/components/schemas/public_message'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/messages/update.yml b/swagger/paths/public/inboxes/messages/update.yml
index a211f39ca..38e41beed 100644
--- a/swagger/paths/public/inboxes/messages/update.yml
+++ b/swagger/paths/public/inboxes/messages/update.yml
@@ -4,16 +4,22 @@ operationId: update-a-message
 summary: Update a message
 description: Update a message
 security: []
-parameters:
-  - name: data
-    in: body
-    required: true
-    schema:
-      $ref: '#/definitions/public_message_update_payload'
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        $ref: '#/components/schemas/public_message_update_payload'
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/public_message'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_message'
+  '401':
     description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/public/inboxes/show.yml b/swagger/paths/public/inboxes/show.yml
index 094caabbf..1effd078b 100644
--- a/swagger/paths/public/inboxes/show.yml
+++ b/swagger/paths/public/inboxes/show.yml
@@ -5,11 +5,21 @@ summary: Inbox details
 description: Get the details of an inbox
 security: []
 responses:
-  200:
+  '200':
     description: Success
-    schema:
-      $ref: '#/definitions/public_inbox'
-  401:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/public_inbox'
+  '401':
     description: Unauthorized
-  404:
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
     description: The given inbox does not exist
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/survey/show.yml b/swagger/paths/survey/show.yml
index c2bd1e8e8..ed9c71785 100644
--- a/swagger/paths/survey/show.yml
+++ b/swagger/paths/survey/show.yml
@@ -5,5 +5,5 @@ summary: Get CSAT survey page
 description: You can redirect the client to this URL, instead of implementing the CSAT survey component yourself.
 security: []
 responses:
-  200:
+  '200':
     description: Success
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 19ef5c904..077b4e688 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1,9 +1,9 @@
 {
-  "swagger": "2.0",
+  "openapi": "3.0.4",
   "info": {
-    "description": "This is the API documentation for Chatwoot server.",
-    "version": "1.0.0",
     "title": "Chatwoot",
+    "description": "This is the API documentation for Chatwoot server.",
+    "version": "1.1.0",
     "termsOfService": "https://www.chatwoot.com/terms-of-service/",
     "contact": {
       "email": "hello@chatwoot.com"
@@ -13,42 +13,9 @@
       "url": "https://opensource.org/licenses/MIT"
     }
   },
-  "host": "app.chatwoot.com",
-  "basePath": "/",
-  "schemes": [
-    "https"
-  ],
-  "produces": [
-    "application/json; charset=utf-8"
-  ],
-  "consumes": [
-    "application/json; charset=utf-8"
-  ],
-  "securityDefinitions": {
-    "userApiKey": {
-      "type": "apiKey",
-      "in": "header",
-      "name": "api_access_token",
-      "description": "This token can be obtained by visiting the profile page or via rails console. Provides access to  endpoints based on the user permissions levels. This token can be saved by an external system when user is created via API, to perform activities on behalf of the user."
-    },
-    "agentBotApiKey": {
-      "type": "apiKey",
-      "in": "header",
-      "name": "api_access_token",
-      "description": "This token should be provided by system admin or obtained via rails console. This token can be used to build bot integrations and can only access limited apis."
-    },
-    "platformAppApiKey": {
-      "type": "apiKey",
-      "in": "header",
-      "name": "api_access_token",
-      "description": "This token can be obtained by the system admin after creating a platformApp. This token should be used to provision agent bots, accounts, users and their roles."
-    }
-  },
-  "security": [
+  "servers": [
     {
-      "userApiKey": [
-
-      ]
+      "url": "https://app.chatwoot.com/"
     }
   ],
   "paths": {
@@ -67,25 +34,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/account_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/account_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/platform_account"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/platform_account"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -93,7 +71,7 @@
     "/platform/api/v1/accounts/{account_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -113,15 +91,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/platform_account"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/platform_account"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given account does not exist"
+            "description": "The given account does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -139,25 +135,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/account_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/account_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/platform_account"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/platform_account"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -180,10 +187,24 @@
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The account does not exist"
+            "description": "The account does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -191,7 +212,7 @@
     "/platform/api/v1/accounts/{account_id}/account_users": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -211,30 +232,23 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of account users",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "account_id": {
-                    "type": "integer",
-                    "description": "The ID of the user"
-                  },
-                  "user_id": {
-                    "type": "integer",
-                    "description": "The ID of the user"
-                  },
-                  "role": {
-                    "type": "string",
-                    "description": "whether user is an administrator or agent"
-                  }
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/account_user"
                 }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -252,52 +266,50 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "user_id",
-                "role"
-              ],
-              "properties": {
-                "user_id": {
-                  "type": "integer",
-                  "description": "The ID of the user"
-                },
-                "role": {
-                  "type": "string",
-                  "description": "whether user is an administrator or agent"
-                }
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/account_user_create_update_payload"
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "properties": {
-                "account_id": {
-                  "type": "integer",
-                  "description": "The ID of the user"
-                },
-                "user_id": {
-                  "type": "integer",
-                  "description": "The ID of the user"
-                },
-                "role": {
-                  "type": "string",
-                  "description": "whether user is an administrator or agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "account_id": {
+                      "type": "integer",
+                      "description": "The ID of the account"
+                    },
+                    "user_id": {
+                      "type": "integer",
+                      "description": "The ID of the user"
+                    },
+                    "role": {
+                      "type": "string",
+                      "description": "whether user is an administrator or agent"
+                    }
+                  }
                 }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -315,34 +327,29 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "user_id"
-              ],
-              "properties": {
-                "user_id": {
-                  "type": "integer",
-                  "description": "The ID of the user"
-                }
-              }
-            }
-          }
-        ],
         "responses": {
           "200": {
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The account does not exist"
+            "description": "The account does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -365,16 +372,27 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of agent bots",
-              "items": {
-                "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of agent bots",
+                  "items": {
+                    "$ref": "#/components/schemas/agent_bot"
+                  }
+                }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -392,25 +410,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/agent_bot_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/platform_agent_bot_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent_bot"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -418,7 +447,7 @@
     "/platform/api/v1/agent_bots/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/agent_bot_id"
+          "$ref": "#/components/parameters/agent_bot_id"
         }
       ],
       "get": {
@@ -438,15 +467,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent_bot"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given agent bot ID does not exist"
+            "description": "The given agent bot ID does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -464,25 +511,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/agent_bot_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/platform_agent_bot_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent_bot"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -505,10 +563,24 @@
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The agent bot does not exist"
+            "description": "The agent bot does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -528,25 +600,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/user_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/user_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/user"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/user"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -554,7 +637,7 @@
     "/platform/api/v1/users/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/platform_user_id"
+          "$ref": "#/components/parameters/platform_user_id"
         }
       ],
       "get": {
@@ -574,15 +657,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/user"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/user"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given user does not exist"
+            "description": "The given user does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -600,25 +701,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/user_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/user_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/user"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/user"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -641,10 +753,24 @@
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The user does not exist"
+            "description": "The user does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -652,7 +778,7 @@
     "/platform/api/v1/users/{id}/login": {
       "parameters": [
         {
-          "$ref": "#/parameters/platform_user_id"
+          "$ref": "#/components/parameters/platform_user_id"
         }
       ],
       "get": {
@@ -672,21 +798,39 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "url": {
-                  "type": "string",
-                  "description": "SSO url to autenticate the user"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "url": {
+                      "type": "string",
+                      "description": "SSO url to autenticate the user"
+                    }
+                  }
                 }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given user does not exist"
+            "description": "The given user does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -694,7 +838,7 @@
     "/public/api/v1/inboxes/{inbox_identifier}": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         }
       ],
       "get": {
@@ -710,15 +854,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/public_inbox"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_inbox"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given inbox does not exist"
+            "description": "The given inbox does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -726,7 +888,7 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         }
       ],
       "post": {
@@ -739,25 +901,36 @@
         "security": [
 
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/public_contact_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/public_contact_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/public_contact"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_contact"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -765,10 +938,10 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         },
         {
-          "$ref": "#/parameters/public_contact_identifier"
+          "$ref": "#/components/parameters/public_contact_identifier"
         }
       ],
       "get": {
@@ -784,15 +957,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/public_contact"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_contact"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given contact does not exist"
+            "description": "The given contact does not exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -806,25 +997,36 @@
         "security": [
 
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/public_contact_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/public_contact_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/public_contact"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_contact"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -832,10 +1034,10 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         },
         {
-          "$ref": "#/parameters/public_contact_identifier"
+          "$ref": "#/components/parameters/public_contact_identifier"
         }
       ],
       "post": {
@@ -848,25 +1050,36 @@
         "security": [
 
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/public_conversation_create_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/public_conversation_create_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/public_conversation"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_conversation"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -877,19 +1090,33 @@
         "operationId": "list-all-contact-conversations",
         "summary": "List all conversations",
         "description": "List all conversations for the contact",
+        "security": [
+
+        ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of conversations",
-              "items": {
-                "$ref": "#/definitions/public_conversation"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of conversations",
+                  "items": {
+                    "$ref": "#/components/schemas/public_conversation"
+                  }
+                }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -897,13 +1124,13 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         },
         {
-          "$ref": "#/parameters/public_contact_identifier"
+          "$ref": "#/components/parameters/public_contact_identifier"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "get": {
@@ -913,18 +1140,39 @@
         "operationId": "get-single-conversation",
         "summary": "Get a single conversation",
         "description": "Retrieves the details of a specific conversation",
+        "security": [
+
+        ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/public_conversation"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_conversation"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -932,13 +1180,13 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/toggle_status": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         },
         {
-          "$ref": "#/parameters/public_contact_identifier"
+          "$ref": "#/components/parameters/public_contact_identifier"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "post": {
@@ -948,18 +1196,39 @@
         "operationId": "resolve-conversation",
         "summary": "Resolve a conversation",
         "description": "Marks a conversation as resolved",
+        "security": [
+
+        ],
         "responses": {
           "200": {
             "description": "Conversation resolved successfully",
-            "schema": {
-              "$ref": "#/definitions/public_conversation"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_conversation"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -967,13 +1236,13 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/toggle_typing": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         },
         {
-          "$ref": "#/parameters/public_contact_identifier"
+          "$ref": "#/components/parameters/public_contact_identifier"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "post": {
@@ -983,24 +1252,64 @@
         "operationId": "toggle-typing-status",
         "summary": "Toggle typing status",
         "description": "Toggles the typing status in a conversation",
+        "security": [
+
+        ],
         "parameters": [
           {
             "name": "typing_status",
             "in": "query",
             "required": true,
-            "type": "string",
+            "schema": {
+              "type": "string"
+            },
             "description": "Typing status, either 'on' or 'off'"
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "typing_status": {
+                    "type": "string",
+                    "enum": [
+                      "on",
+                      "off"
+                    ],
+                    "description": "The typing status to set",
+                    "example": "on"
+                  }
+                }
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Typing status toggled successfully"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1008,13 +1317,13 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/update_last_seen": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         },
         {
-          "$ref": "#/parameters/public_contact_identifier"
+          "$ref": "#/components/parameters/public_contact_identifier"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "post": {
@@ -1024,15 +1333,32 @@
         "operationId": "update-last-seen",
         "summary": "Update last seen",
         "description": "Updates the last seen time of the contact in a conversation",
+        "security": [
+
+        ],
         "responses": {
           "200": {
             "description": "Last seen updated successfully"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1040,13 +1366,13 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/messages": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         },
         {
-          "$ref": "#/parameters/public_contact_identifier"
+          "$ref": "#/components/parameters/public_contact_identifier"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "post": {
@@ -1059,25 +1385,36 @@
         "security": [
 
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/public_message_create_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/public_message_create_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/public_message"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_message"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1088,19 +1425,33 @@
         "operationId": "list-all-converation-messages",
         "summary": "List all messages",
         "description": "List all messages in the conversation",
+        "security": [
+
+        ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of messages",
-              "items": {
-                "$ref": "#/definitions/public_message"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of messages",
+                  "items": {
+                    "$ref": "#/components/schemas/public_message"
+                  }
+                }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1108,16 +1459,16 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/messages/{message_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         },
         {
-          "$ref": "#/parameters/public_contact_identifier"
+          "$ref": "#/components/parameters/public_contact_identifier"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         },
         {
-          "$ref": "#/parameters/message_id"
+          "$ref": "#/components/parameters/message_id"
         }
       ],
       "patch": {
@@ -1130,98 +1481,36 @@
         "security": [
 
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/public_message_update_payload"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/public_message"
-            }
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      }
-    },
-    "/api/v1/accounts/{account_id}/contacts/{contact_identifier}/labels": {
-      "parameters": [
-        {
-          "$ref": "#/parameters/account_id"
-        },
-        {
-          "$ref": "#/parameters/public_contact_identifier"
-        }
-      ],
-      "get": {
-        "tags": [
-          "Contact Labels"
-        ],
-        "operationId": "list-all-labels-of-a-contact",
-        "summary": "List Labels",
-        "description": "Lists all the labels of a contact",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_labels"
-            }
-          },
-          "404": {
-            "description": "Contact not found"
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      },
-      "post": {
-        "tags": [
-          "Contact Labels"
-        ],
-        "operationId": "contact-add-labels",
-        "summary": "Add Labels",
-        "description": "Add labels to a contact. Note that this API would overwrite the existing list of labels associated to the conversation.",
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "labels": {
-                  "type": "array",
-                  "description": "Array of labels (comma-separated strings)",
-                  "items": {
-                    "type": "string"
-                  }
-                }
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/public_message_update_payload"
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_labels"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/public_message"
+                }
+              }
             }
           },
-          "404": {
-            "description": "Contact not found"
-          },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1229,7 +1518,7 @@
     "/survey/responses/{conversation_uuid}": {
       "parameters": [
         {
-          "$ref": "#/parameters/conversation_uuid"
+          "$ref": "#/components/parameters/conversation_uuid"
         }
       ],
       "get": {
@@ -1252,7 +1541,7 @@
     "/api/v1/accounts/{account_id}/agent_bots": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -1262,19 +1551,37 @@
         "operationId": "list-all-account-agent-bots",
         "summary": "List all AgentBots",
         "description": "List all agent bots available for the current account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of agent bots",
-              "items": {
-                "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of agent bots",
+                  "items": {
+                    "$ref": "#/components/schemas/agent_bot"
+                  }
+                }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1285,28 +1592,43 @@
         "operationId": "create-an-account-agent-bot",
         "summary": "Create an Agent Bot",
         "description": "Create an agent bot in the account",
-        "parameters": [
+        "security": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/agent_bot_create_update_payload"
-            }
+            "userApiKey": [
+
+            ]
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/agent_bot_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent_bot"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1314,10 +1636,10 @@
     "/api/v1/accounts/{account_id}/agent_bots/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/agent_bot_id"
+          "$ref": "#/components/parameters/agent_bot_id"
         }
       ],
       "get": {
@@ -1327,18 +1649,43 @@
         "operationId": "get-details-of-a-single-account-agent-bot",
         "summary": "Get an agent bot details",
         "description": "Get the details of an agent bot in the account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent_bot"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given agent bot ID does not exist in the account"
+            "description": "The given agent bot ID does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1349,25 +1696,43 @@
         "operationId": "update-an-account-agent-bot",
         "summary": "Update an agent bot",
         "description": "Update an agent bot's attributes",
-        "parameters": [
+        "security": [
           {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/agent_bot_create_update_payload"
-            }
+            "userApiKey": [
+
+            ]
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/agent_bot_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent_bot"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1378,15 +1743,36 @@
         "operationId": "delete-an-account-agent-bot",
         "summary": "Delete an AgentBot",
         "description": "Delete an AgentBot from the account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The agent bot does not exist in the account"
+            "description": "The agent bot does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1394,7 +1780,7 @@
     "/api/v1/accounts/{account_id}/agents": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -1414,16 +1800,27 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all active agents",
-              "items": {
-                "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all active agents",
+                  "items": {
+                    "$ref": "#/components/schemas/agent"
+                  }
+                }
               }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1441,61 +1838,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "name",
-                "email",
-                "role"
-              ],
-              "properties": {
-                "name": {
-                  "type": "string",
-                  "description": "Full Name of the agent"
-                },
-                "email": {
-                  "type": "string",
-                  "description": "Email of the Agent"
-                },
-                "role": {
-                  "type": "string",
-                  "enum": [
-                    "agent",
-                    "administrator"
-                  ],
-                  "description": "Whether its administrator or agent"
-                },
-                "availability_status": {
-                  "type": "string",
-                  "enum": [
-                    "available",
-                    "busy",
-                    "offline"
-                  ],
-                  "description": "The availability setting of the agent."
-                },
-                "auto_offline": {
-                  "type": "boolean",
-                  "description": "Whether the availability status of agent is configured to go offline automatically when away."
-                }
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/agent_create_payload"
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1503,7 +1875,7 @@
     "/api/v1/accounts/{account_id}/agents/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "patch": {
@@ -1524,57 +1896,53 @@
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the agent to be updated."
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "role"
-              ],
-              "properties": {
-                "role": {
-                  "type": "string",
-                  "enum": [
-                    "agent",
-                    "administrator"
-                  ],
-                  "description": "Whether its administrator or agent"
-                },
-                "availability": {
-                  "type": "string",
-                  "enum": [
-                    "available",
-                    "busy",
-                    "offline"
-                  ],
-                  "description": "The availability setting of the agent."
-                },
-                "auto_offline": {
-                  "type": "boolean",
-                  "description": "Whether the availability status of agent is configured to go offline automatically when away."
-                }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/agent_update_payload"
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent"
+                }
+              }
             }
           },
           "404": {
-            "description": "Agent not found"
+            "description": "Agent not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1596,9 +1964,11 @@
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
-            "description": "The ID of the agent to be deleted"
+            "description": "The ID of the agent to be deleted."
           }
         ],
         "responses": {
@@ -1606,10 +1976,24 @@
             "description": "Success"
           },
           "404": {
-            "description": "Agent not found"
+            "description": "Agent not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1617,7 +2001,7 @@
     "/api/v1/accounts/{account_id}/canned_responses": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -1637,16 +2021,27 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all canned responses",
-              "items": {
-                "$ref": "#/definitions/canned_response"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all canned responses",
+                  "items": {
+                    "$ref": "#/components/schemas/canned_response"
+                  }
+                }
               }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1664,25 +2059,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/canned_response_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/canned_response_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/canned_response"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/canned_response"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1690,12 +2096,12 @@
     "/api/v1/accounts/{account_id}/canned_responses/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "patch": {
         "tags": [
-          "Canned Response"
+          "Canned Responses"
         ],
         "operationId": "update-canned-response-in-account",
         "summary": "Update Canned Response in Account",
@@ -1711,31 +2117,53 @@
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the canned response to be updated."
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/canned_response_create_update_payload"
-            }
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/canned_response_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/canned_response"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/canned_response"
+                }
+              }
             }
           },
           "404": {
-            "description": "Agent not found"
+            "description": "Agent not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1757,7 +2185,9 @@
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the canned response to be deleted"
           }
@@ -1767,10 +2197,24 @@
             "description": "Success"
           },
           "404": {
-            "description": "Canned Response not found"
+            "description": "Canned Response not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1778,7 +2222,7 @@
     "/api/v1/accounts/{account_id}/custom_attribute_definitions": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -1791,11 +2235,13 @@
           {
             "name": "attribute_model",
             "in": "query",
-            "type": "string",
-            "enum": [
-              "0",
-              "1"
-            ],
+            "schema": {
+              "type": "string",
+              "enum": [
+                "0",
+                "1"
+              ]
+            },
             "description": "conversation_attribute(0)/contact_attribute(1)",
             "required": true
           }
@@ -1811,16 +2257,27 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all custom attributes",
-              "items": {
-                "$ref": "#/definitions/custom_attribute"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all custom attributes",
+                  "items": {
+                    "$ref": "#/components/schemas/custom_attribute"
+                  }
+                }
               }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1838,25 +2295,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/custom_attribute_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/custom_attribute_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/custom_attribute"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/custom_attribute"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1864,12 +2332,14 @@
     "/api/v1/accounts/{account_id}/custom_attribute_definitions/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
           "name": "id",
           "in": "path",
-          "type": "number",
+          "schema": {
+            "type": "number"
+          },
           "description": "ID of the custom attribute",
           "required": true
         }
@@ -1880,15 +2350,24 @@
         ],
         "operationId": "get-details-of-a-single-custom-attribute",
         "summary": "Get a custom attribute details",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get the details of a custom attribute in the account",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the custom attribute to be updated."
           }
@@ -1896,15 +2375,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/custom_attribute"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/custom_attribute"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given attribute ID does not exist in the account"
+            "description": "The given attribute ID does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1926,31 +2423,53 @@
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the custom attribute to be updated."
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/custom_attribute_create_update_payload"
-            }
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/custom_attribute_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/custom_attribute"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/custom_attribute"
+                }
+              }
             }
           },
           "404": {
-            "description": "Agent not found"
+            "description": "Agent not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -1970,12 +2489,14 @@
         ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the custom attribute to be deleted"
           }
@@ -1985,10 +2506,24 @@
             "description": "Success"
           },
           "404": {
-            "description": "Custom attribute not found"
+            "description": "Custom attribute not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -1999,30 +2534,45 @@
           "Contacts"
         ],
         "operationId": "contactList",
-        "description": "Listing all the resolved contacts with pagination (Page size = 15) . Resolved contacts are the ones with a value for identifier, email or phone number",
+        "description": "Listing all the resolved contacts with pagination (Page size = 15). Resolved contacts are the ones with a value for identifier, email or phone number",
         "summary": "List Contacts",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
-            "$ref": "#/parameters/contact_sort_param"
+            "$ref": "#/components/parameters/contact_sort_param"
           },
           {
-            "$ref": "#/parameters/page"
+            "$ref": "#/components/parameters/page"
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_list"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_list"
+                }
+              }
             }
           },
           "400": {
             "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
         }
@@ -2034,30 +2584,47 @@
         "operationId": "contactCreate",
         "description": "Create a new Contact",
         "summary": "Create Contact",
-        "parameters": [
+        "security": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/contact_create"
-            }
+            "userApiKey": [
+
+            ]
           }
         ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/account_id"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/contact_create_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/extended_contact"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/extended_contact"
+                }
+              }
             }
           },
           "400": {
             "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
         }
@@ -2066,14 +2633,16 @@
     "/api/v1/accounts/{account_id}/contacts/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
           "name": "id",
           "in": "path",
-          "type": "number",
-          "description": "ID of the contact",
-          "required": true
+          "required": true,
+          "schema": {
+            "type": "number"
+          },
+          "description": "ID of the contact"
         }
       ],
       "get": {
@@ -2082,19 +2651,44 @@
         ],
         "operationId": "contactDetails",
         "summary": "Show Contact",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get a contact belonging to the account using ID",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/extended_contact"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/extended_contact"
+                }
+              }
             }
           },
           "404": {
-            "description": "Contact not found"
+            "description": "Contact not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -2104,29 +2698,54 @@
         ],
         "operationId": "contactUpdate",
         "summary": "Update Contact",
-        "description": "Update a contact belonging to the account using ID",
-        "parameters": [
+        "security": [
           {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/contact_update"
-            }
+            "userApiKey": [
+
+            ]
           }
         ],
+        "description": "Update a contact belonging to the account using ID",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/contact_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "204": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_base"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_base"
+                }
+              }
             }
           },
           "404": {
-            "description": "Contact not found"
+            "description": "Contact not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -2136,51 +2755,247 @@
         ],
         "operationId": "contactDelete",
         "summary": "Delete Contact",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "description": "Delete a contact belonging to the account using ID",
         "responses": {
           "200": {
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "Contact not found"
+            "description": "Contact not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
     },
     "/api/v1/accounts/{account_id}/contacts/{id}/conversations": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        },
+        {
+          "name": "id",
+          "in": "path",
+          "required": true,
+          "schema": {
+            "type": "number"
+          },
+          "description": "ID of the contact"
+        }
+      ],
       "get": {
         "tags": [
           "Contacts"
         ],
         "operationId": "contactConversations",
         "summary": "Contact Conversations",
-        "description": "Get conversations associated to that contact",
+        "description": "Get conversations associated with that contact",
         "parameters": [
-          {
-            "$ref": "#/parameters/account_id"
-          },
           {
             "name": "id",
             "in": "path",
-            "type": "number",
-            "description": "ID of the contact",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "number"
+            },
+            "description": "ID of the contact"
+          }
+        ],
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_conversations"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_conversations"
+                }
+              }
             }
           },
           "404": {
-            "description": "Contact not found"
+            "description": "Contact not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/contacts/{id}/labels": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        },
+        {
+          "name": "id",
+          "in": "path",
+          "required": true,
+          "schema": {
+            "type": "number"
+          },
+          "description": "ID of the contact"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Contacts"
+        ],
+        "operationId": "list-all-labels-of-a-contact",
+        "summary": "List Labels",
+        "description": "Lists all the labels of a contact",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_labels"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Contact not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Contacts"
+        ],
+        "operationId": "contact-add-labels",
+        "summary": "Add Labels",
+        "description": "Add labels to a contact. Note that this API would overwrite the existing list of labels associated to the conversation.",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "labels"
+                ],
+                "properties": {
+                  "labels": {
+                    "type": "array",
+                    "description": "Array of labels (comma-separated strings)",
+                    "items": {
+                      "type": "string"
+                    },
+                    "example": [
+                      "support",
+                      "billing"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_labels"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Contact not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -2193,50 +3008,62 @@
         "operationId": "contactSearch",
         "description": "Search the resolved contacts using a search key, currently supports email search (Page size = 15). Resolved contacts are the ones with a value for identifier, email or phone number",
         "summary": "Search Contacts",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "name": "q",
             "in": "query",
-            "type": "string",
+            "schema": {
+              "type": "string"
+            },
             "description": "Search using contact `name`, `identifier`, `email` or `phone number`"
           },
           {
-            "$ref": "#/parameters/contact_sort_param"
+            "$ref": "#/components/parameters/contact_sort_param"
           },
           {
-            "$ref": "#/parameters/page"
+            "$ref": "#/components/parameters/page"
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "payload": {
-                  "$ref": "#/definitions/contact_list"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "payload": {
+                      "$ref": "#/components/schemas/contact_list"
+                    }
+                  }
                 }
               }
             }
           },
           "401": {
             "description": "Authentication error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
         }
       }
     },
     "/api/v1/accounts/{account_id}/contacts/filter": {
-      "parameters": [
-        {
-          "$ref": "#/parameters/account_id"
-        }
-      ],
       "post": {
         "tags": [
           "Contacts"
@@ -2248,97 +3075,107 @@
           {
             "userApiKey": [
 
-            ]
-          },
-          {
-            "agentBotApiKey": [
-
             ]
           }
         ],
         "parameters": [
           {
-            "name": "page",
-            "in": "query",
-            "type": "integer"
+            "$ref": "#/components/parameters/account_id"
           },
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
+            "name": "page",
+            "in": "query",
             "schema": {
-              "type": "object",
-              "properties": {
-                "payload": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "attribute_key": {
-                        "type": "string",
-                        "description": "filter attribute name"
-                      },
-                      "filter_operator": {
-                        "type": "string",
-                        "description": "filter operator name",
-                        "enum": [
-                          "equal_to",
-                          "not_equal_to",
-                          "contains",
-                          "does_not_contain"
-                        ]
-                      },
-                      "values": {
-                        "type": "array",
-                        "items": {
-                          "type": "string"
+              "type": "number"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "payload": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "attribute_key": {
+                          "type": "string",
+                          "description": "filter attribute name"
                         },
-                        "description": "array of the attribute values to filter"
-                      },
-                      "query_operator": {
-                        "type": "string",
-                        "description": "query operator name",
-                        "enum": [
-                          "AND",
-                          "OR"
-                        ]
+                        "filter_operator": {
+                          "type": "string",
+                          "description": "filter operator name",
+                          "enum": [
+                            "equal_to",
+                            "not_equal_to",
+                            "contains",
+                            "does_not_contain"
+                          ]
+                        },
+                        "values": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          },
+                          "description": "array of the attribute values to filter"
+                        },
+                        "query_operator": {
+                          "type": "string",
+                          "description": "query operator name",
+                          "enum": [
+                            "AND",
+                            "OR"
+                          ]
+                        }
                       }
-                    }
-                  },
-                  "example": [
-                    {
-                      "attribute_key": "name",
-                      "filter_operator": "equal_to",
-                      "values": [
-                        "en"
-                      ],
-                      "query_operator": "AND"
                     },
-                    {
-                      "attribute_key": "country_code",
-                      "filter_operator": "equal_to",
-                      "values": [
-                        "us"
-                      ],
-                      "query_operator": null
-                    }
-                  ]
+                    "example": [
+                      {
+                        "attribute_key": "name",
+                        "filter_operator": "equal_to",
+                        "values": [
+                          "en"
+                        ],
+                        "query_operator": "AND"
+                      },
+                      {
+                        "attribute_key": "country_code",
+                        "filter_operator": "equal_to",
+                        "values": [
+                          "us"
+                        ],
+                        "query_operator": null
+                      }
+                    ]
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_list"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_list"
+                }
+              }
             }
           },
           "400": {
             "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
         }
@@ -2354,52 +3191,79 @@
         "summary": "Create contact inbox",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "name": "id",
             "in": "path",
-            "type": "number",
+            "schema": {
+              "type": "number"
+            },
             "description": "ID of the contact",
             "required": true
-          },
+          }
+        ],
+        "security": [
           {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "inbox_id"
-              ],
-              "properties": {
-                "inbox_id": {
-                  "type": "number",
-                  "description": "The ID of the inbox"
-                },
-                "source_id": {
-                  "type": "string",
-                  "description": "Contact Inbox Source Id"
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "inbox_id"
+                ],
+                "properties": {
+                  "inbox_id": {
+                    "type": "number",
+                    "description": "The ID of the inbox",
+                    "example": 1
+                  },
+                  "source_id": {
+                    "type": "string",
+                    "description": "Contact Inbox Source Id"
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_inboxes"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_inboxes"
+                }
+              }
             }
           },
           "401": {
             "description": "Authentication error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           },
           "422": {
-            "description": "Incorrect payload"
+            "description": "Incorrect payload",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -2412,14 +3276,23 @@
         "operationId": "contactableInboxesGet",
         "description": "Get List of contactable Inboxes",
         "summary": "Get Contactable Inboxes",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "name": "id",
             "in": "path",
-            "type": "number",
+            "schema": {
+              "type": "number"
+            },
             "description": "ID of the contact",
             "required": true
           }
@@ -2427,18 +3300,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contactable_inboxes"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contactable_inboxes"
+                }
+              }
             }
           },
           "401": {
             "description": "Authentication error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           },
           "422": {
-            "description": "Incorrect payload"
+            "description": "Incorrect payload",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -2446,7 +3334,7 @@
     "/api/v1/accounts/{account_id}/automation_rules": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -2457,10 +3345,10 @@
         "summary": "List all automation rules in an account",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
-            "$ref": "#/parameters/page"
+            "$ref": "#/components/parameters/page"
           }
         ],
         "description": "Get details of automation rules in an Account",
@@ -2474,16 +3362,27 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all automation rules",
-              "items": {
-                "$ref": "#/definitions/automation_rule"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all automation rules",
+                  "items": {
+                    "$ref": "#/components/schemas/automation_rule"
+                  }
+                }
               }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -2501,25 +3400,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/automation_rule_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/automation_rule_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/automation_rule"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/automation_rule"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -2527,12 +3437,14 @@
     "/api/v1/accounts/{account_id}/automation_rules/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
           "name": "id",
           "in": "path",
-          "type": "number",
+          "schema": {
+            "type": "number"
+          },
           "description": "ID of the Automation Rule",
           "required": true
         }
@@ -2544,11 +3456,20 @@
         "operationId": "get-details-of-a-single-automation-rule",
         "summary": "Get a automation rule details",
         "description": "Get the details of a automation rule in the account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the automation rule to be updated."
           }
@@ -2556,15 +3477,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/automation_rule"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/automation_rule"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given rule ID does not exist in the account"
+            "description": "The given rule ID does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -2586,31 +3525,53 @@
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the automation rule to be updated."
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/automation_rule_create_update_payload"
-            }
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/automation_rule_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/automation_rule"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/automation_rule"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "Rule not found"
+            "description": "Rule not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -2632,7 +3593,9 @@
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the automation rule to be deleted"
           }
@@ -2642,10 +3605,24 @@
             "description": "Success"
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "automation rule not found"
+            "description": "automation rule not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -2653,7 +3630,7 @@
     "/api/v1/accounts/{account_id}/portals": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "post": {
@@ -2670,25 +3647,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/portal_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/portal_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/portal"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/portal"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -2700,7 +3688,7 @@
         "summary": "List all portals in an account",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           }
         ],
         "description": "Get details of portals in an Account",
@@ -2714,26 +3702,47 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all portals",
-              "items": {
-                "$ref": "#/definitions/portal"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all portals",
+                  "items": {
+                    "$ref": "#/components/schemas/portal"
+                  }
+                }
               }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
-      },
+      }
+    },
+    "/api/v1/accounts/{account_id}/portals/{id}": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        },
+        {
+          "$ref": "#/components/parameters/portal_id"
+        }
+      ],
       "patch": {
         "tags": [
           "Help Center"
         ],
-        "operationId": "update-new-portal-to-account",
-        "summary": "update a new portal",
-        "description": "update a new portal to account",
+        "operationId": "update-portal-to-account",
+        "summary": "Update a portal",
+        "description": "Update a portal to account",
         "security": [
           {
             "userApiKey": [
@@ -2741,36 +3750,47 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/portal_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/portal_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/portal"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/portal"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
     },
-    "/api/v1/accounts/{account_id}/portals/{portal_id}/categories": {
+    "/api/v1/accounts/{account_id}/portals/{id}/categories": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/portal_id"
+          "$ref": "#/components/parameters/portal_id"
         }
       ],
       "post": {
@@ -2787,36 +3807,47 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/category_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/category_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/category"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/category"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
     },
-    "/api/v1/accounts/{account_id}/portals/{portal_id}/articles": {
+    "/api/v1/accounts/{account_id}/portals/{id}/articles": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/portal_id"
+          "$ref": "#/components/parameters/portal_id"
         }
       ],
       "post": {
@@ -2833,25 +3864,36 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/article_create_update_payload"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/article_create_update_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/article"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/article"
+                }
+              }
             }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -2859,7 +3901,7 @@
     "/api/v1/accounts/{account_id}/conversations/meta": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -2869,66 +3911,87 @@
         "operationId": "conversationListMeta",
         "description": "Get open, unassigned and all Conversation counts",
         "summary": "Get Conversation Counts",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
             "name": "status",
             "in": "query",
-            "type": "string",
-            "enum": [
-              "all",
-              "open",
-              "resolved",
-              "pending",
-              "snoozed"
-            ],
-            "default": "open",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "all",
+                "open",
+                "resolved",
+                "pending",
+                "snoozed"
+              ],
+              "default": "open"
+            },
             "description": "Filter by conversation status."
           },
           {
             "name": "q",
             "in": "query",
-            "type": "string",
+            "schema": {
+              "type": "string"
+            },
             "description": "Filters conversations with messages containing the search term"
           },
           {
             "name": "inbox_id",
             "in": "query",
-            "type": "integer"
+            "schema": {
+              "type": "integer"
+            }
           },
           {
             "name": "team_id",
             "in": "query",
-            "type": "integer"
+            "schema": {
+              "type": "integer"
+            }
           },
           {
             "name": "labels",
             "in": "query",
-            "type": "array",
-            "items": {
-              "type": "string"
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             }
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "meta": {
+            "content": {
+              "application/json": {
+                "schema": {
                   "type": "object",
                   "properties": {
-                    "mine_count": {
-                      "type": "number"
-                    },
-                    "unassigned_count": {
-                      "type": "number"
-                    },
-                    "assigned_count": {
-                      "type": "number"
-                    },
-                    "all_count": {
-                      "type": "number"
+                    "meta": {
+                      "type": "object",
+                      "properties": {
+                        "mine_count": {
+                          "type": "number"
+                        },
+                        "unassigned_count": {
+                          "type": "number"
+                        },
+                        "assigned_count": {
+                          "type": "number"
+                        },
+                        "all_count": {
+                          "type": "number"
+                        }
+                      }
                     }
                   }
                 }
@@ -2937,8 +4000,12 @@
           },
           "400": {
             "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
         }
@@ -2947,7 +4014,7 @@
     "/api/v1/accounts/{account_id}/conversations": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -2957,77 +4024,106 @@
         "operationId": "conversationList",
         "description": "List all the conversations with pagination",
         "summary": "Conversations List",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
             "name": "assignee_type",
             "in": "query",
-            "type": "string",
-            "enum": [
-              "me",
-              "unassigned",
-              "all",
-              "assigned"
-            ],
-            "default": "all",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "me",
+                "unassigned",
+                "all",
+                "assigned"
+              ],
+              "default": "all"
+            },
             "description": "Filter conversations by assignee type."
           },
           {
             "name": "status",
             "in": "query",
-            "type": "string",
-            "enum": [
-              "all",
-              "open",
-              "resolved",
-              "pending",
-              "snoozed"
-            ],
-            "default": "open",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "all",
+                "open",
+                "resolved",
+                "pending",
+                "snoozed"
+              ],
+              "default": "open"
+            },
             "description": "Filter by conversation status."
           },
           {
             "name": "q",
             "in": "query",
-            "type": "string",
+            "schema": {
+              "type": "string"
+            },
             "description": "Filters conversations with messages containing the search term"
           },
           {
             "name": "inbox_id",
             "in": "query",
-            "type": "integer"
+            "schema": {
+              "type": "integer"
+            }
           },
           {
             "name": "team_id",
             "in": "query",
-            "type": "integer"
+            "schema": {
+              "type": "integer"
+            }
           },
           {
             "name": "labels",
             "in": "query",
-            "type": "array",
-            "items": {
-              "type": "string"
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             }
           },
           {
             "name": "page",
             "in": "query",
-            "type": "integer",
-            "default": 1,
+            "schema": {
+              "type": "integer",
+              "default": 1
+            },
             "description": "paginate through conversations"
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/conversation_list"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/conversation_list"
+                }
+              }
             }
           },
           "400": {
             "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
         }
@@ -3038,7 +4134,7 @@
         ],
         "operationId": "newConversation",
         "summary": "Create New Conversation",
-        "description": "Creating a conversation in chatwoot requires a source id. \n\n Learn more about source_id: https://github.com/chatwoot/chatwoot/wiki/Building-on-Top-of-Chatwoot:-Importing-Existing-Contacts-and-Creating-Conversations",
+        "description": "Creating a conversation in chatwoot requires a source id. \n\n Learn more about source_id: https://www.chatwoot.com/hc/user-guide/articles/1677839703-how-to-create-an-api-channel-inbox#send-messages-to-the-api-channel",
         "security": [
           {
             "userApiKey": [
@@ -3051,127 +4147,50 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "source_id",
-                "inbox_id"
-              ],
-              "properties": {
-                "source_id": {
-                  "type": "string",
-                  "description": "Conversation source id"
-                },
-                "inbox_id": {
-                  "type": "string",
-                  "description": "Id of inbox in which the conversation is created <br/> Allowed Inbox Types: Website, Phone, Api, Email "
-                },
-                "contact_id": {
-                  "type": "string",
-                  "description": "Contact Id for which conversation is created"
-                },
-                "additional_attributes": {
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/conversation_create_payload"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
                   "type": "object",
-                  "description": "Lets you specify attributes like browser information"
-                },
-                "custom_attributes": {
-                  "type": "object",
-                  "description": "The object to save custom attributes for conversation, accepts custom attributes key and value",
-                  "example": {
-                    "attribute_key": "attribute_value",
-                    "priority_conversation_number": 3
-                  }
-                },
-                "status": {
-                  "type": "string",
-                  "enum": [
-                    "open",
-                    "resolved",
-                    "pending"
-                  ],
-                  "description": "Specify the conversation whether it's pending, open, closed"
-                },
-                "assignee_id": {
-                  "type": "string",
-                  "description": "Agent Id for assigning a conversation to an agent"
-                },
-                "team_id": {
-                  "type": "string",
-                  "description": "Team Id for assigning a conversation to a team"
-                },
-                "message": {
-                  "type": "object",
-                  "description": "The initial message to be sent to the conversation",
-                  "required": [
-                    "content"
-                  ],
                   "properties": {
-                    "content": {
-                      "type": "string",
-                      "description": "The content of the message"
+                    "id": {
+                      "type": "number",
+                      "description": "ID of the conversation"
                     },
-                    "template_params": {
-                      "type": "object",
-                      "description": "The template params for the message in case of whatsapp Channel",
-                      "properties": {
-                        "name": {
-                          "type": "string",
-                          "description": "Name of the template",
-                          "example": "sample_issue_resolution"
-                        },
-                        "category": {
-                          "type": "string",
-                          "description": "Category of the template",
-                          "example": "UTILITY"
-                        },
-                        "language": {
-                          "type": "string",
-                          "description": "Language of the template",
-                          "example": "en_US"
-                        },
-                        "processed_params": {
-                          "type": "object",
-                          "description": "The processed param values for template variables in template",
-                          "example": {
-                            "1": "Chatwoot"
-                          }
-                        }
-                      }
+                    "account_id": {
+                      "type": "number",
+                      "description": "Account Id"
+                    },
+                    "inbox_id": {
+                      "type": "number",
+                      "description": "ID of the inbox"
                     }
                   }
                 }
               }
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "number",
-                  "description": "ID of the conversation"
-                },
-                "account_id": {
-                  "type": "number",
-                  "description": "Account Id"
-                },
-                "inbox_id": {
-                  "type": "number",
-                  "description": "ID of the inbox"
+          },
+          "403": {
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
                 }
               }
             }
-          },
-          "403": {
-            "description": "Access denied"
           }
         }
       }
@@ -3179,7 +4198,7 @@
     "/api/v1/accounts/{account_id}/conversations/filter": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "post": {
@@ -3193,11 +4212,6 @@
           {
             "userApiKey": [
 
-            ]
-          },
-          {
-            "agentBotApiKey": [
-
             ]
           }
         ],
@@ -3205,85 +4219,97 @@
           {
             "name": "page",
             "in": "query",
-            "type": "integer"
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
             "schema": {
-              "type": "object",
-              "properties": {
-                "payload": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "attribute_key": {
-                        "type": "string",
-                        "description": "filter attribute name"
-                      },
-                      "filter_operator": {
-                        "type": "string",
-                        "description": "filter operator name",
-                        "enum": [
-                          "equal_to",
-                          "not_equal_to",
-                          "contains",
-                          "does_not_contain"
-                        ]
-                      },
-                      "values": {
-                        "type": "array",
-                        "items": {
-                          "type": "string"
+              "type": "number"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "payload": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "attribute_key": {
+                          "type": "string",
+                          "description": "filter attribute name"
                         },
-                        "description": "array of the attribute values to filter"
-                      },
-                      "query_operator": {
-                        "type": "string",
-                        "description": "query operator name",
-                        "enum": [
-                          "AND",
-                          "OR"
-                        ]
+                        "filter_operator": {
+                          "type": "string",
+                          "description": "filter operator name",
+                          "enum": [
+                            "equal_to",
+                            "not_equal_to",
+                            "contains",
+                            "does_not_contain"
+                          ]
+                        },
+                        "values": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          },
+                          "description": "array of the attribute values to filter"
+                        },
+                        "query_operator": {
+                          "type": "string",
+                          "description": "query operator name",
+                          "enum": [
+                            "AND",
+                            "OR"
+                          ]
+                        }
                       }
-                    }
-                  },
-                  "example": [
-                    {
-                      "attribute_key": "browser_language",
-                      "filter_operator": "not_eq",
-                      "values": [
-                        "en"
-                      ],
-                      "query_operator": "AND"
                     },
-                    {
-                      "attribute_key": "status",
-                      "filter_operator": "eq",
-                      "values": [
-                        "pending"
-                      ],
-                      "query_operator": null
-                    }
-                  ]
+                    "example": [
+                      {
+                        "attribute_key": "browser_language",
+                        "filter_operator": "not_equal_to",
+                        "values": [
+                          "en"
+                        ],
+                        "query_operator": "AND"
+                      },
+                      {
+                        "attribute_key": "status",
+                        "filter_operator": "equal_to",
+                        "values": [
+                          "pending"
+                        ],
+                        "query_operator": null
+                      }
+                    ]
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/conversation_list"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/conversation_list"
+                }
+              }
             }
           },
           "400": {
             "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
         }
@@ -3292,10 +4318,10 @@
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "get": {
@@ -3304,19 +4330,44 @@
         ],
         "operationId": "get-details-of-a-conversation",
         "summary": "Conversation Details",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get all details regarding a conversation with all messages in the conversation",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/conversation_show"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/conversation_show"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           },
           "404": {
-            "description": "Conversation not found"
-          },
-          "403": {
-            "description": "Access denied"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -3339,42 +4390,58 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "priority": {
-                  "type": "string",
-                  "enum": [
-                    "urgent",
-                    "high",
-                    "medium",
-                    "low",
-                    "none"
-                  ],
-                  "description": "The priority of the conversation"
-                },
-                "sla_policy_id": {
-                  "type": "number",
-                  "description": "The ID of the SLA policy (Available only in Enterprise edition)"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "priority": {
+                    "type": "string",
+                    "enum": [
+                      "urgent",
+                      "high",
+                      "medium",
+                      "low",
+                      "none"
+                    ],
+                    "description": "The priority of the conversation",
+                    "example": "high"
+                  },
+                  "sla_policy_id": {
+                    "type": "number",
+                    "description": "The ID of the SLA policy (Available only in Enterprise edition)",
+                    "example": 1
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success"
           },
-          "404": {
-            "description": "Conversation not found"
-          },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3382,10 +4449,10 @@
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_status": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "post": {
@@ -3407,42 +4474,61 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "status"
-              ],
-              "properties": {
-                "status": {
-                  "type": "string",
-                  "enum": [
-                    "open",
-                    "resolved",
-                    "pending"
-                  ],
-                  "description": "The status of the conversation"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "status"
+                ],
+                "properties": {
+                  "status": {
+                    "type": "string",
+                    "enum": [
+                      "open",
+                      "resolved",
+                      "pending"
+                    ],
+                    "description": "The status of the conversation",
+                    "example": "open"
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/conversation_status_toggle"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/conversation_status_toggle"
+                }
+              }
             }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3450,10 +4536,10 @@
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_priority": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "post": {
@@ -3475,41 +4561,56 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "priority"
-              ],
-              "properties": {
-                "priority": {
-                  "type": "string",
-                  "enum": [
-                    "urgent",
-                    "high",
-                    "medium",
-                    "low",
-                    "none"
-                  ],
-                  "description": "The priority of the conversation"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "priority"
+                ],
+                "properties": {
+                  "priority": {
+                    "type": "string",
+                    "enum": [
+                      "urgent",
+                      "high",
+                      "medium",
+                      "low",
+                      "none"
+                    ],
+                    "description": "The priority of the conversation",
+                    "example": "high"
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success"
           },
-          "404": {
-            "description": "Conversation not found"
-          },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3517,10 +4618,10 @@
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/custom_attributes": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "post": {
@@ -3534,55 +4635,68 @@
           {
             "userApiKey": [
 
-            ]
-          },
-          {
-            "agentBotApiKey": [
-
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "custom_attributes"
-              ],
-              "properties": {
-                "custom_attributes": {
-                  "type": "object",
-                  "description": "The custom attributes to be set for the conversation",
-                  "example": {
-                    "order_id": "12345",
-                    "previous_conversation": "67890"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "custom_attributes"
+                ],
+                "properties": {
+                  "custom_attributes": {
+                    "type": "object",
+                    "description": "The custom attributes to be set for the conversation",
+                    "example": {
+                      "order_id": "12345",
+                      "previous_conversation": "67890"
+                    }
                   }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "custom_attributes": {
+            "content": {
+              "application/json": {
+                "schema": {
                   "type": "object",
-                  "description": "The custom attributes of the conversation"
+                  "properties": {
+                    "custom_attributes": {
+                      "type": "object",
+                      "description": "The custom attributes of the conversation"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
                 }
               }
             }
           },
           "404": {
-            "description": "Conversation not found"
-          },
-          "401": {
-            "description": "Unauthorized"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3590,15 +4704,15 @@
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/assignments": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "post": {
         "tags": [
-          "Conversation Assignment"
+          "Conversations"
         ],
         "operationId": "assign-a-conversation",
         "summary": "Assign Conversation",
@@ -3615,38 +4729,58 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "assignee_id": {
-                  "type": "number",
-                  "description": "Id of the assignee user"
-                },
-                "team_id": {
-                  "type": "number",
-                  "description": "Id of the team. If the assignee_id is present, this param would be ignored"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "assignee_id": {
+                    "type": "number",
+                    "description": "Id of the assignee user",
+                    "example": 1
+                  },
+                  "team_id": {
+                    "type": "number",
+                    "description": "Id of the team. If the assignee_id is present, this param would be ignored",
+                    "example": 1
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/user"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/user"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           },
           "404": {
-            "description": "Conversation not found"
-          },
-          "401": {
-            "description": "Unauthorized"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3654,72 +4788,129 @@
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/labels": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "get": {
         "tags": [
-          "Conversation Labels"
+          "Conversations"
         ],
         "operationId": "list-all-labels-of-a-conversation",
         "summary": "List Labels",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Lists all the labels of a conversation",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/conversation_labels"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/conversation_labels"
+                }
+              }
             }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
       "post": {
         "tags": [
-          "Conversation Labels"
+          "Conversations"
         ],
         "operationId": "conversation-add-labels",
         "summary": "Add Labels",
-        "description": "Add labels to a conversation. Note that this API would overwrite the existing list of labels associated to the conversation.",
-        "parameters": [
+        "security": [
           {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "labels": {
-                  "type": "array",
-                  "description": "Array of labels (comma-separated strings)",
-                  "items": {
-                    "type": "string"
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "description": "Add labels to a conversation. Note that this API would overwrite the existing list of labels associated to the conversation.",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "labels"
+                ],
+                "properties": {
+                  "labels": {
+                    "type": "array",
+                    "description": "Array of labels (comma-separated strings)",
+                    "items": {
+                      "type": "string"
+                    },
+                    "example": [
+                      "support",
+                      "billing"
+                    ]
                   }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/conversation_labels"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/conversation_labels"
+                }
+              }
             }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3732,27 +4923,52 @@
         "operationId": "listAllInboxes",
         "summary": "List all inboxes",
         "description": "List all inboxes available in the current account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of inboxes",
-              "items": {
-                "$ref": "#/definitions/inbox"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of inboxes",
+                  "items": {
+                    "$ref": "#/components/schemas/inbox"
+                  }
+                }
               }
             }
           },
           "404": {
-            "description": "Inbox not found"
+            "description": "Inbox not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3764,15 +4980,24 @@
         ],
         "operationId": "GetInbox",
         "summary": "Get an inbox",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get an inbox available in the current account",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "name": "id",
             "in": "path",
-            "type": "number",
+            "schema": {
+              "type": "number"
+            },
             "description": "ID of the inbox",
             "required": true
           }
@@ -3780,15 +5005,33 @@
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/inbox"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/inbox"
+                }
+              }
             }
           },
           "404": {
-            "description": "Inbox not found"
+            "description": "Inbox not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3801,73 +5044,58 @@
         "operationId": "inboxCreation",
         "summary": "Create an inbox",
         "description": "You can create more than one website inbox in each account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "name": {
-                  "type": "string",
-                  "description": "The name of the inbox"
-                },
-                "avatar": {
-                  "type": "string",
-                  "format": "binary",
-                  "description": "File for avatar image"
-                },
-                "channel": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "string",
-                      "enum": [
-                        "web_widget"
-                      ]
-                    },
-                    "website_url": {
-                      "type": "string",
-                      "description": "URL at which the widget will be loaded"
-                    },
-                    "welcome_title": {
-                      "type": "string",
-                      "description": "Welcome title to be displayed on the widget"
-                    },
-                    "welcome_tagline": {
-                      "type": "string",
-                      "description": "Welcome tagline to be displayed on the widget"
-                    },
-                    "agent_away_message": {
-                      "type": "string",
-                      "description": "A message which will be sent if there is not agent available. This is not available if agentbot is connected"
-                    },
-                    "widget_color": {
-                      "type": "string",
-                      "description": "A Hex-color string used to customize the widget"
-                    }
-                  }
-                }
+            "$ref": "#/components/parameters/account_id"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/inbox_create_payload"
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/inbox"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/inbox"
+                }
+              }
             }
           },
           "404": {
-            "description": "Inbox not found"
+            "description": "Inbox not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3879,82 +5107,68 @@
         ],
         "operationId": "updateInbox",
         "summary": "Update Inbox",
-        "description": "Add avatar and disable auto assignment for an inbox",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "description": "Update an existing inbox",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "name": "id",
             "in": "path",
-            "type": "number",
+            "schema": {
+              "type": "number"
+            },
             "description": "ID of the inbox",
             "required": true
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "enable_auto_assignment"
-              ],
-              "properties": {
-                "name": {
-                  "type": "string",
-                  "description": "The name of the inbox"
-                },
-                "enable_auto_assignment": {
-                  "type": "boolean",
-                  "description": "Enable Auto Assignment"
-                },
-                "avatar": {
-                  "type": "string",
-                  "format": "binary",
-                  "description": "Image file for avatar"
-                },
-                "channel": {
-                  "type": "object",
-                  "properties": {
-                    "website_url": {
-                      "type": "string",
-                      "description": "URL at which the widget will be loaded"
-                    },
-                    "welcome_title": {
-                      "type": "string",
-                      "description": "Welcome title to be displayed on the widget"
-                    },
-                    "welcome_tagline": {
-                      "type": "string",
-                      "description": "Welcome tagline to be displayed on the widget"
-                    },
-                    "agent_away_message": {
-                      "type": "string",
-                      "description": "A message which will be sent if there is not agent available. This is not available if agentbot is connected"
-                    },
-                    "widget_color": {
-                      "type": "string",
-                      "description": "A Hex-color string used to customize the widget"
-                    }
-                  }
-                }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/inbox_update_payload"
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/inbox"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/inbox"
+                }
+              }
             }
           },
           "404": {
-            "description": "Inbox not found"
+            "description": "Inbox not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -3967,14 +5181,23 @@
         "operationId": "getInboxAgentBot",
         "summary": "Show Inbox Agent Bot",
         "description": "See if an agent bot is associated to the Inbox",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "name": "id",
             "in": "path",
-            "type": "number",
+            "schema": {
+              "type": "number"
+            },
             "description": "ID of the inbox",
             "required": true
           }
@@ -3982,15 +5205,33 @@
         "responses": {
           "204": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/agent_bot"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/agent_bot"
+                }
+              }
             }
           },
           "404": {
-            "description": "Inbox not found, Agent bot not found"
+            "description": "Inbox not found, Agent bot not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4002,45 +5243,71 @@
         ],
         "operationId": "updateAgentBot",
         "summary": "Add or remove agent bot",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "To add an agent bot pass agent_bot id, to remove agent bot from an inbox pass null",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
             "name": "id",
             "in": "path",
-            "type": "number",
+            "schema": {
+              "type": "number"
+            },
             "description": "ID of the inbox",
             "required": true
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "agent_bot"
-              ],
-              "properties": {
-                "agent_bot": {
-                  "type": "number",
-                  "description": "Agent bot ID"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "agent_bot"
+                ],
+                "properties": {
+                  "agent_bot": {
+                    "type": "number",
+                    "description": "Agent bot ID",
+                    "example": 1
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "204": {
             "description": "Success"
           },
           "404": {
-            "description": "Inbox not found, Agent bot not found"
+            "description": "Inbox not found, Agent bot not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4048,10 +5315,10 @@
     "/api/v1/accounts/{account_id}/inbox_members/{inbox_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/inbox_id"
+          "$ref": "#/components/parameters/inbox_id"
         }
       ],
       "get": {
@@ -4070,25 +5337,43 @@
         ],
         "parameters": [
           {
-            "$ref": "#/parameters/inbox_id"
+            "$ref": "#/components/parameters/inbox_id"
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all active agents",
-              "items": {
-                "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all active agents",
+                  "items": {
+                    "$ref": "#/components/schemas/agent"
+                  }
+                }
               }
             }
           },
           "404": {
-            "description": "Inbox not found"
+            "description": "Inbox not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4096,7 +5381,7 @@
     "/api/v1/accounts/{account_id}/inbox_members": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "post": {
@@ -4113,52 +5398,81 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "inbox_id",
-                "user_ids"
-              ],
-              "properties": {
-                "inbox_id": {
-                  "type": "string",
-                  "description": "The ID of the inbox"
-                },
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "inbox_id",
+                  "user_ids"
+                ],
+                "properties": {
+                  "inbox_id": {
+                    "type": "integer",
+                    "description": "The ID of the inbox",
+                    "example": 1
                   },
-                  "description": "IDs of users to be added to the inbox"
+                  "user_ids": {
+                    "type": "array",
+                    "items": {
+                      "type": "integer"
+                    },
+                    "description": "IDs of users to be added to the inbox",
+                    "example": [
+                      1
+                    ]
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all active agents",
-              "items": {
-                "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all active agents",
+                  "items": {
+                    "$ref": "#/components/schemas/agent"
+                  }
+                }
               }
             }
           },
           "404": {
-            "description": "Inbox not found"
+            "description": "Inbox not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "422": {
-            "description": "User must exist"
+            "description": "User must exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4176,52 +5490,81 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "inbox_id",
-                "user_ids"
-              ],
-              "properties": {
-                "inbox_id": {
-                  "type": "string",
-                  "description": "The ID of the inbox"
-                },
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "inbox_id",
+                  "user_ids"
+                ],
+                "properties": {
+                  "inbox_id": {
+                    "type": "string",
+                    "description": "The ID of the inbox",
+                    "example": 1
                   },
-                  "description": "IDs of users to be added to the inbox"
+                  "user_ids": {
+                    "type": "array",
+                    "items": {
+                      "type": "integer"
+                    },
+                    "description": "IDs of users to be added to the inbox",
+                    "example": [
+                      1
+                    ]
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all active agents",
-              "items": {
-                "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all active agents",
+                  "items": {
+                    "$ref": "#/components/schemas/agent"
+                  }
+                }
               }
             }
           },
           "404": {
-            "description": "Inbox not found"
+            "description": "Inbox not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "422": {
-            "description": "User must exist"
+            "description": "User must exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4239,45 +5582,66 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "inbox_id",
-                "user_ids"
-              ],
-              "properties": {
-                "inbox_id": {
-                  "type": "string",
-                  "description": "The ID of the inbox"
-                },
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "inbox_id",
+                  "user_ids"
+                ],
+                "properties": {
+                  "inbox_id": {
+                    "type": "string",
+                    "description": "The ID of the inbox"
                   },
-                  "description": "IDs of users to be deleted from the inbox"
+                  "user_ids": {
+                    "type": "array",
+                    "items": {
+                      "type": "integer"
+                    },
+                    "description": "IDs of users to be deleted from the inbox"
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success"
           },
           "404": {
-            "description": "Inbox not found"
+            "description": "Inbox not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "422": {
-            "description": "User must exist"
+            "description": "User must exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4285,10 +5649,10 @@
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/messages": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         }
       ],
       "get": {
@@ -4297,30 +5661,55 @@
         ],
         "operationId": "list-all-messages",
         "summary": "Get messages",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "List all messages of a conversation",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of messages",
-              "items": {
-                "allOf": [
-                  {
-                    "$ref": "#/definitions/generic_id"
-                  },
-                  {
-                    "$ref": "#/definitions/message"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of messages",
+                  "items": {
+                    "allOf": [
+                      {
+                        "$ref": "#/components/schemas/generic_id"
+                      },
+                      {
+                        "$ref": "#/components/schemas/message"
+                      }
+                    ]
                   }
-                ]
+                }
               }
             }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4343,35 +5732,53 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/conversation_message_create"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/conversation_message_create_payload"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/generic_id"
-                },
-                {
-                  "$ref": "#/definitions/message"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "allOf": [
+                    {
+                      "$ref": "#/components/schemas/generic_id"
+                    },
+                    {
+                      "$ref": "#/components/schemas/message"
+                    }
+                  ]
                 }
-              ]
+              }
             }
           },
           "404": {
-            "description": "Conversation not found"
+            "description": "Conversation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4379,13 +5786,13 @@
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/messages/{message_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/conversation_id"
+          "$ref": "#/components/parameters/conversation_id"
         },
         {
-          "$ref": "#/parameters/message_id"
+          "$ref": "#/components/parameters/message_id"
         }
       ],
       "delete": {
@@ -4394,16 +5801,37 @@
         ],
         "operationId": "delete-a-message",
         "summary": "Delete a message",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Delete a message and it's attachments from the conversation.",
         "responses": {
           "200": {
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The message or conversation does not exist in the account"
+            "description": "The message or conversation does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4411,7 +5839,7 @@
     "/api/v1/accounts/{account_id}/integrations/apps": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -4420,23 +5848,48 @@
         ],
         "operationId": "get-details-of-all-integrations",
         "summary": "List all the Integrations",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get the details of all Integrations available for the account",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of Integration apps",
-              "items": {
-                "$ref": "#/definitions/integrations_app"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of Integration apps",
+                  "items": {
+                    "$ref": "#/components/schemas/integrations_app"
+                  }
+                }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "Url not found"
+            "description": "Url not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4449,28 +5902,48 @@
         "operationId": "create-an-integration-hook",
         "summary": "Create an integration hook",
         "description": "Create an integration hook",
-        "parameters": [
+        "security": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/integrations_hook_create_payload"
-            }
+            "userApiKey": [
+
+            ]
           }
         ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/account_id"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/integrations_hook_create_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/integrations_hook"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/integrations_hook"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4483,31 +5956,51 @@
         "operationId": "update-an-integrations-hook",
         "summary": "Update an Integration Hook",
         "description": "Update an Integration Hook",
-        "parameters": [
+        "security": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "$ref": "#/parameters/hook_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/integrations_hook_update_payload"
-            }
+            "userApiKey": [
+
+            ]
           }
         ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/account_id"
+          },
+          {
+            "$ref": "#/components/parameters/hook_id"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/integrations_hook_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/integrations_hook"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/integrations_hook"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4518,12 +6011,19 @@
         "operationId": "delete-an-integration-hook",
         "summary": "Delete an Integration Hook",
         "description": "Delete an Integration Hook",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
-            "$ref": "#/parameters/hook_id"
+            "$ref": "#/components/parameters/hook_id"
           }
         ],
         "responses": {
@@ -4531,10 +6031,24 @@
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The hook does not exist in the account"
+            "description": "The hook does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4547,15 +6061,33 @@
         "operationId": "fetchProfile",
         "summary": "Fetch user profile",
         "description": "Get the user profile details",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/user"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/user"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4563,7 +6095,7 @@
     "/api/v1/accounts/{account_id}/teams": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -4572,20 +6104,38 @@
         ],
         "operationId": "list-all-teams",
         "summary": "List all teams",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "List all teams available in the current account",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of teams",
-              "items": {
-                "$ref": "#/definitions/team"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of teams",
+                  "items": {
+                    "$ref": "#/components/schemas/team"
+                  }
+                }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4595,29 +6145,49 @@
         ],
         "operationId": "create-a-team",
         "summary": "Create a team",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Create a team in the account",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/team_create_update_payload"
-            }
+            "$ref": "#/components/parameters/account_id"
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/team_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/team"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/team"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4625,10 +6195,10 @@
     "/api/v1/accounts/{account_id}/teams/{team_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/team_id"
+          "$ref": "#/components/parameters/team_id"
         }
       ],
       "get": {
@@ -4637,19 +6207,44 @@
         ],
         "operationId": "get-details-of-a-single-team",
         "summary": "Get a team details",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get the details of a team in the account",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/team"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/team"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given team ID does not exist in the account"
+            "description": "The given team ID does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4659,26 +6254,44 @@
         ],
         "operationId": "update-a-team",
         "summary": "Update a team",
-        "description": "Update a team's attributes",
-        "parameters": [
+        "security": [
           {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/team_create_update_payload"
-            }
+            "userApiKey": [
+
+            ]
           }
         ],
+        "description": "Update a team's attributes",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/team_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/team"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/team"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4688,16 +6301,37 @@
         ],
         "operationId": "delete-a-team",
         "summary": "Delete a team",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Delete a team from the account",
         "responses": {
           "200": {
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The team does not exist in the account"
+            "description": "The team does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4705,10 +6339,10 @@
     "/api/v1/accounts/{account_id}/teams/{team_id}/team_members": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/team_id"
+          "$ref": "#/components/parameters/team_id"
         }
       ],
       "get": {
@@ -4727,28 +6361,46 @@
         ],
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
+            "$ref": "#/components/parameters/account_id"
           },
           {
-            "$ref": "#/parameters/team_id"
+            "$ref": "#/components/parameters/team_id"
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all agents in the team",
-              "items": {
-                "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all agents in the team",
+                  "items": {
+                    "$ref": "#/components/schemas/agent"
+                  }
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
               }
             }
           },
           "404": {
-            "description": "Inbox not found"
-          },
-          "403": {
-            "description": "Access denied"
+            "description": "Team not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4766,47 +6418,75 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "user_ids"
-              ],
-              "properties": {
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
-                  },
-                  "description": "IDs of users to be added to the team"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "user_ids"
+                ],
+                "properties": {
+                  "user_ids": {
+                    "type": "array",
+                    "items": {
+                      "type": "integer"
+                    },
+                    "description": "IDs of users to be added to the team",
+                    "example": [
+                      1
+                    ]
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all active agents",
-              "items": {
-                "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all active agents",
+                  "items": {
+                    "$ref": "#/components/schemas/agent"
+                  }
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
               }
             }
           },
           "404": {
-            "description": "Team not found"
-          },
-          "403": {
-            "description": "Access denied"
+            "description": "Team not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "422": {
-            "description": "User must exist"
+            "description": "User must exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4824,47 +6504,75 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "user_ids"
-              ],
-              "properties": {
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
-                  },
-                  "description": "IDs of users to be added to the team"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "user_ids"
+                ],
+                "properties": {
+                  "user_ids": {
+                    "type": "array",
+                    "items": {
+                      "type": "integer"
+                    },
+                    "description": "IDs of users to be added to the team",
+                    "example": [
+                      1
+                    ]
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all agents in the team",
-              "items": {
-                "$ref": "#/definitions/agent"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of all agents in the team",
+                  "items": {
+                    "$ref": "#/components/schemas/agent"
+                  }
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
               }
             }
           },
           "404": {
-            "description": "Team not found"
-          },
-          "403": {
-            "description": "Access denied"
+            "description": "Team not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "422": {
-            "description": "User must exist"
+            "description": "User must exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4882,41 +6590,61 @@
             ]
           }
         ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "team_id",
-                "user_ids"
-              ],
-              "properties": {
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
-                  },
-                  "description": "IDs of users to be deleted from the team"
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "user_ids"
+                ],
+                "properties": {
+                  "user_ids": {
+                    "type": "array",
+                    "items": {
+                      "type": "integer"
+                    },
+                    "description": "IDs of users to be deleted from the team"
+                  }
                 }
               }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success"
           },
-          "404": {
-            "description": "Team not found"
-          },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Team not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "422": {
-            "description": "User must exist"
+            "description": "User must exist",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4924,17 +6652,19 @@
     "/api/v1/accounts/{account_id}/custom_filters": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
           "in": "query",
           "name": "filter_type",
-          "type": "string",
-          "enum": [
-            "conversation",
-            "contact",
-            "report"
-          ],
+          "schema": {
+            "type": "string",
+            "enum": [
+              "conversation",
+              "contact",
+              "report"
+            ]
+          },
           "required": false,
           "description": "The type of custom filter"
         }
@@ -4946,19 +6676,37 @@
         "operationId": "list-all-filters",
         "summary": "List all custom filters",
         "description": "List all custom filters in a category of a user",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of custom filters",
-              "items": {
-                "$ref": "#/definitions/custom_filter"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of custom filters",
+                  "items": {
+                    "$ref": "#/components/schemas/custom_filter"
+                  }
+                }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -4971,26 +6719,46 @@
         "description": "Create a custom filter in the account",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/custom_filter_create_update_payload"
-            }
+            "$ref": "#/components/parameters/account_id"
           }
         ],
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/custom_filter_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/custom_filter"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/custom_filter"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -4998,10 +6766,10 @@
     "/api/v1/accounts/{account_id}/custom_filters/{custom_filter_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/custom_filter_id"
+          "$ref": "#/components/parameters/custom_filter_id"
         }
       ],
       "get": {
@@ -5011,18 +6779,43 @@
         "operationId": "get-details-of-a-single-custom-filter",
         "summary": "Get a custom filter details",
         "description": "Get the details of a custom filter in the account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/custom_filter"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/custom_filter"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The given team ID does not exist in the account"
+            "description": "The given team ID does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -5032,26 +6825,44 @@
         ],
         "operationId": "update-a-custom-filter",
         "summary": "Update a custom filter",
-        "description": "Update a custom filter's attributes",
-        "parameters": [
+        "security": [
           {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/custom_filter_create_update_payload"
-            }
+            "userApiKey": [
+
+            ]
           }
         ],
+        "description": "Update a custom filter's attributes",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/custom_filter_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/custom_filter"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/custom_filter"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -5061,16 +6872,37 @@
         ],
         "operationId": "delete-a-custom-filter",
         "summary": "Delete a custom filter",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Delete a custom filter from the account",
         "responses": {
           "200": {
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The custom filter does not exist in the account"
+            "description": "The custom filter does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -5078,7 +6910,7 @@
     "/api/v1/accounts/{account_id}/webhooks": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -5087,20 +6919,38 @@
         ],
         "operationId": "list-all-webhooks",
         "summary": "List all webhooks",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "List all webhooks in the account",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of webhook objects",
-              "items": {
-                "$ref": "#/definitions/webhook"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of webhook objects",
+                  "items": {
+                    "$ref": "#/components/schemas/webhook"
+                  }
+                }
               }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -5110,29 +6960,49 @@
         ],
         "operationId": "create-a-webhook",
         "summary": "Add a webhook",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Add a webhook subscription to the account",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/webhook_create_update_payload"
-            }
+            "$ref": "#/components/parameters/account_id"
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/webhook_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/webhook"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/webhook"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -5140,10 +7010,10 @@
     "/api/v1/accounts/{account_id}/webhooks/{webhook_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/webhook_id"
+          "$ref": "#/components/parameters/webhook_id"
         }
       ],
       "patch": {
@@ -5152,29 +7022,49 @@
         ],
         "operationId": "update-a-webhook",
         "summary": "Update a webhook object",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Update a webhook object in the account",
         "parameters": [
           {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/webhook_create_update_payload"
-            }
+            "$ref": "#/components/parameters/account_id"
           }
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/webhook_create_update_payload"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/webhook"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/webhook"
+                }
+              }
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -5184,16 +7074,37 @@
         ],
         "operationId": "delete-a-webhook",
         "summary": "Delete a webhook",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Delete a webhook from the account",
         "responses": {
           "200": {
             "description": "Success"
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object"
+                }
+              }
+            }
           },
           "404": {
-            "description": "The webhook does not exist in the account"
+            "description": "The webhook does not exist in the account",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -5201,30 +7112,36 @@
     "/api/v2/accounts/{account_id}/reports": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/report_metric"
+          "$ref": "#/components/parameters/report_metric"
         },
         {
-          "$ref": "#/parameters/report_type"
+          "$ref": "#/components/parameters/report_type"
         },
         {
           "in": "query",
           "name": "id",
-          "type": "string",
+          "schema": {
+            "type": "string"
+          },
           "description": "The Id of specific object in case of agent/inbox/label"
         },
         {
           "in": "query",
           "name": "since",
-          "type": "string",
+          "schema": {
+            "type": "string"
+          },
           "description": "The timestamp from where report should start."
         },
         {
           "in": "query",
           "name": "until",
-          "type": "string",
+          "schema": {
+            "type": "string"
+          },
           "description": "The timestamp from where report should stop."
         }
       ],
@@ -5234,31 +7151,56 @@
         ],
         "operationId": "list-all-conversation-statistics",
         "summary": "Get Account reports",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get Account reports for a specific type, metric and date range",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of date based conversation statistics",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "value": {
-                    "type": "string"
-                  },
-                  "timestamp": {
-                    "type": "number"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of date based conversation statistics",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "value": {
+                        "type": "string"
+                      },
+                      "timestamp": {
+                        "type": "number"
+                      }
+                    }
                   }
                 }
               }
             }
           },
           "404": {
-            "description": "reports not found"
+            "description": "reports not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -5266,27 +7208,33 @@
     "/api/v2/accounts/{account_id}/reports/summary": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/report_type"
+          "$ref": "#/components/parameters/report_type"
         },
         {
           "in": "query",
           "name": "id",
-          "type": "string",
+          "schema": {
+            "type": "string"
+          },
           "description": "The Id of specific object in case of agent/inbox/label"
         },
         {
           "in": "query",
           "name": "since",
-          "type": "string",
+          "schema": {
+            "type": "string"
+          },
           "description": "The timestamp from where report should start."
         },
         {
           "in": "query",
           "name": "until",
-          "type": "string",
+          "schema": {
+            "type": "string"
+          },
           "description": "The timestamp from where report should stop."
         }
       ],
@@ -5296,19 +7244,44 @@
         ],
         "operationId": "list-all-conversation-statistics-summary",
         "summary": "Get Account reports summary",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get Account reports summary for a specific type and date range",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/account_summary"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/account_summary"
+                }
+              }
             }
           },
           "404": {
-            "description": "reports not found"
+            "description": "reports not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -5316,15 +7289,17 @@
     "/api/v2/accounts/{account_id}/reports/conversations": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
           "in": "query",
           "name": "type",
-          "type": "string",
-          "enum": [
-            "account"
-          ],
+          "schema": {
+            "type": "string",
+            "enum": [
+              "account"
+            ]
+          },
           "required": true,
           "description": "Type of report"
         }
@@ -5335,31 +7310,56 @@
         ],
         "operationId": "get-account-conversation-metrics",
         "summary": "Account Conversation Metrics",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get conversation metrics for Account",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "object",
-              "description": "Object of account conversation metrics",
-              "properties": {
-                "open": {
-                  "type": "number"
-                },
-                "unattended": {
-                  "type": "number"
-                },
-                "unassigned": {
-                  "type": "number"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "description": "Object of account conversation metrics",
+                  "properties": {
+                    "open": {
+                      "type": "number"
+                    },
+                    "unattended": {
+                      "type": "number"
+                    },
+                    "unassigned": {
+                      "type": "number"
+                    }
+                  }
                 }
               }
             }
           },
           "404": {
-            "description": "reports not found"
+            "description": "reports not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -5367,22 +7367,26 @@
     "/api/v2/accounts/{account_id}/reports/conversations/": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
           "in": "query",
           "name": "type",
-          "type": "string",
-          "enum": [
-            "agent"
-          ],
+          "schema": {
+            "type": "string",
+            "enum": [
+              "agent"
+            ]
+          },
           "required": true,
           "description": "Type of report"
         },
         {
           "in": "query",
           "name": "user_id",
-          "type": "string",
+          "schema": {
+            "type": "string"
+          },
           "description": "The numeric ID of the user"
         }
       ],
@@ -5392,1718 +7396,2607 @@
         ],
         "operationId": "get-agent-conversation-metrics",
         "summary": "Agent Conversation Metrics",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
         "description": "Get conversation metrics for Agent",
         "responses": {
           "200": {
             "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of agent based conversation metrics",
-              "items": {
-                "$ref": "#/definitions/agent_conversation_metrics"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "description": "Array of agent based conversation metrics",
+                  "items": {
+                    "$ref": "#/components/schemas/agent_conversation_metrics"
+                  }
+                }
               }
             }
           },
           "404": {
-            "description": "reports not found"
+            "description": "reports not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Access denied"
-          }
-        }
-      }
-    }
-  },
-  "definitions": {
-    "bad_request_error": {
-      "title": "data",
-      "type": "object",
-      "properties": {
-        "description": {
-          "type": "string"
-        },
-        "errors": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/request_error"
-          }
-        }
-      }
-    },
-    "request_error": {
-      "type": "object",
-      "properties": {
-        "field": {
-          "type": "string"
-        },
-        "message": {
-          "type": "string"
-        },
-        "code": {
-          "type": "string"
-        }
-      }
-    },
-    "generic_id": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number"
-        }
-      }
-    },
-    "canned_response": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer",
-          "description": "ID of the canned response"
-        },
-        "content": {
-          "type": "string",
-          "description": "Message content for canned response"
-        },
-        "short_code": {
-          "type": "string",
-          "description": "Short Code for quick access of the canned response"
-        },
-        "account_id": {
-          "type": "integer",
-          "description": "Account Id"
-        }
-      }
-    },
-    "custom_attribute": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer",
-          "description": "Identifier"
-        },
-        "attribute_display_name": {
-          "type": "string",
-          "description": "Attribute display name"
-        },
-        "attribute_display_type": {
-          "type": "string",
-          "description": "Attribute display type (text, number, currency, percent, link, date, list, checkbox)"
-        },
-        "attribute_description": {
-          "type": "string",
-          "description": "Attribute description"
-        },
-        "attribute_key": {
-          "type": "string",
-          "description": "Attribute unique key value"
-        },
-        "attribute_values": {
-          "type": "string",
-          "description": "Attribute values"
-        },
-        "default_value": {
-          "type": "string",
-          "description": "Attribute default value"
-        },
-        "attribute_model": {
-          "type": "string",
-          "description": "Attribute type(conversation_attribute/contact_attribute)"
-        },
-        "account_id": {
-          "type": "integer",
-          "description": "Account Id"
-        }
-      }
-    },
-    "automation_rule": {
-      "type": "object",
-      "properties": {
-        "event_name": {
-          "type": "string",
-          "description": "Automation Rule event, on which we call the actions(conversation_created, conversation_updated, message_created)",
-          "enum": [
-            "conversation_created",
-            "conversation_updated",
-            "message_created"
-          ],
-          "example": "message_created"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the rule",
-          "example": "Add label on message create event"
-        },
-        "description": {
-          "type": "string",
-          "description": "Description to give more context about the rule",
-          "example": "Add label support and sales on message create event if incoming message content contains text help"
-        },
-        "active": {
-          "type": "boolean",
-          "description": "Enable/disable automation rule"
-        },
-        "actions": {
-          "type": "array",
-          "description": "Array of actions which we perform when condition matches",
-          "items": {
-            "type": "object",
-            "example": {
-              "action_name": "add_label",
-              "action_params": [
-                "support",
-                "sales"
-              ]
-            }
-          }
-        },
-        "conditions": {
-          "type": "array",
-          "description": "Array of conditions on which conversation/message filter would work",
-          "items": {
-            "type": "object",
-            "example": {
-              "attribute_key": "content",
-              "filter_operator": "contains",
-              "values": [
-                "help"
-              ],
-              "query_operator": "nil"
-            }
-          }
-        },
-        "account_id": {
-          "type": "integer",
-          "description": "Account Id"
-        }
-      }
-    },
-    "portal": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer"
-        },
-        "archived": {
-          "type": "boolean"
-        },
-        "color": {
-          "type": "string"
-        },
-        "config": {
-          "type": "object",
-          "description": "Save information about locales, allowed_locales and default portal/help-center locale"
-        },
-        "custom_domain": {
-          "type": "string"
-        },
-        "header_text": {
-          "type": "string",
-          "description": "The text content."
-        },
-        "homepage_link": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "slug": {
-          "type": "string"
-        },
-        "page_title": {
-          "type": "string"
-        },
-        "account_id": {
-          "type": "integer"
-        },
-        "categories": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/category"
-          }
-        },
-        "articles": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/article"
-          }
-        }
-      }
-    },
-    "category": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer"
-        },
-        "description": {
-          "type": "string",
-          "description": "The text content."
-        },
-        "locale": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "slug": {
-          "type": "string"
-        },
-        "position": {
-          "type": "integer"
-        },
-        "portal_id": {
-          "type": "integer"
-        },
-        "account_id": {
-          "type": "integer"
-        },
-        "associated_category_id": {
-          "type": "integer",
-          "description": "To associate similar categories to each other, e.g same category of product documentation in different languages"
-        },
-        "parent_category_id": {
-          "type": "integer",
-          "description": "To define parent category, e.g product documentation has multiple level features in sales category or in engineering category."
-        }
-      }
-    },
-    "article": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer"
-        },
-        "content": {
-          "type": "string",
-          "description": "The text content."
-        },
-        "meta": {
-          "type": "object"
-        },
-        "position": {
-          "type": "integer"
-        },
-        "status": {
-          "type": "integer",
-          "enum": [
-            "draft",
-            "published",
-            "archived"
-          ]
-        },
-        "title": {
-          "type": "string"
-        },
-        "slug": {
-          "type": "string"
-        },
-        "views": {
-          "type": "integer"
-        },
-        "portal_id": {
-          "type": "integer"
-        },
-        "account_id": {
-          "type": "integer"
-        },
-        "author_id": {
-          "type": "integer"
-        },
-        "category_id": {
-          "type": "integer"
-        },
-        "folder_id": {
-          "type": "integer"
-        },
-        "associated_article_id": {
-          "type": "integer",
-          "description": "To associate similar articles to each other, e.g to provide the link for the reference."
-        }
-      }
-    },
-    "contact": {
-      "type": "object",
-      "properties": {
-        "payload": {
-          "type": "object",
-          "properties": {
-            "contact": {
-              "type": "object",
-              "properties": {
-                "email": {
-                  "type": "string",
-                  "description": "Email address of the contact"
-                },
-                "name": {
-                  "type": "string",
-                  "description": "The name of the contact"
-                },
-                "phone_number": {
-                  "type": "string",
-                  "description": "Phone number of the contact"
-                },
-                "thumbnail": {
-                  "type": "string",
-                  "description": "Avatar URL of the contact"
-                },
-                "additional_attributes": {
-                  "type": "object",
-                  "description": "The object containing additional attributes related to the contact"
-                },
-                "custom_attributes": {
-                  "type": "object",
-                  "description": "The object to save custom attributes for contact, accepts custom attributes key and value",
-                  "example": {
-                    "attribute_key": "attribute_value",
-                    "signed_up_at": "dd/mm/yyyy"
-                  }
-                },
-                "contact_inboxes": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/contact_inboxes"
-                  }
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
                 }
               }
             }
           }
         }
       }
-    },
-    "conversation": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number",
-          "description": "ID of the conversation"
-        },
-        "messages": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/message"
-          }
-        },
-        "account_id": {
-          "type": "number",
-          "description": "Account Id"
-        },
-        "inbox_id": {
-          "type": "number",
-          "description": "ID of the inbox"
-        },
-        "status": {
-          "type": "string",
-          "enum": [
-            "open",
-            "resolved",
-            "pending"
-          ],
-          "description": "The status of the conversation"
-        },
-        "timestamp": {
-          "type": "string",
-          "description": "The time at which conversation was created"
-        },
-        "contact_last_seen_at": {
-          "type": "string"
-        },
-        "agent_last_seen_at": {
-          "type": "string"
-        },
-        "unread_count": {
-          "type": "number",
-          "description": "The number of unread messages"
-        },
-        "additional_attributes": {
-          "type": "object",
-          "description": "The object containing additional attributes related to the conversation"
-        },
-        "custom_attributes": {
-          "type": "object",
-          "description": "The object to save custom attributes for conversation, accepts custom attributes key and value",
-          "example": {
-            "attribute_key": "attribute_value",
-            "priority_conversation_number": 3
-          }
-        }
-      }
-    },
-    "message": {
-      "type": "object",
-      "properties": {
-        "content": {
-          "type": "string",
-          "description": "The text content of the message"
-        },
-        "content_type": {
-          "type": "string",
-          "enum": [
-            "text",
-            "input_select",
-            "cards",
-            "form"
-          ],
-          "description": "The type of the template message"
-        },
-        "content_attributes": {
-          "type": "object",
-          "description": "The content attributes for each content_type"
-        },
-        "message_type": {
-          "type": "string",
-          "enum": [
-            "incoming",
-            "outgoing",
-            "activity",
-            "template"
-          ],
-          "description": "The type of the message"
-        },
-        "created_at": {
-          "type": "integer",
-          "description": "The time at which message was created"
-        },
-        "private": {
-          "type": "boolean",
-          "description": "The flags which shows whether the message is private or not"
-        },
-        "attachment": {
-          "type": "object",
-          "description": "The file object attached to the image"
-        },
-        "sender": {
-          "type": "object",
-          "description": "User/Agent/AgentBot object"
-        },
-        "conversation_id": {
-          "type": "number",
-          "description": "ID of the conversation"
-        }
-      }
-    },
-    "user": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number"
-        },
-        "uid": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "available_name": {
-          "type": "string"
-        },
-        "display_name": {
-          "type": "string"
-        },
-        "email": {
-          "type": "string"
-        },
-        "account_id": {
-          "type": "number"
-        },
-        "role": {
-          "type": "string",
-          "enum": [
-            "agent",
-            "administrator"
-          ]
-        },
-        "confirmed": {
-          "type": "boolean"
-        },
-        "custom_attributes": {
-          "type": "object",
-          "description": "Available for users who are created through platform APIs and has custom attributes associated."
-        },
-        "accounts": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/account"
-          }
-        }
-      }
-    },
-    "agent": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer"
-        },
-        "uid": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "available_name": {
-          "type": "string"
-        },
-        "display_name": {
-          "type": "string"
-        },
-        "email": {
-          "type": "string"
-        },
-        "account_id": {
-          "type": "integer"
-        },
-        "role": {
-          "type": "string",
-          "enum": [
-            "agent",
-            "administrator"
-          ]
-        },
-        "confirmed": {
-          "type": "boolean"
-        },
-        "availability_status": {
-          "type": "string",
-          "enum": [
-            "available",
-            "busy",
-            "offline"
-          ],
-          "description": "The availability status of the agent computed by Chatwoot."
-        },
-        "auto_offline": {
-          "type": "boolean",
-          "description": "Whether the availability status of agent is configured to go offline automatically when away."
-        },
-        "custom_attributes": {
-          "type": "object",
-          "description": "Available for users who are created through platform APIs and has custom attributes associated."
-        }
-      }
-    },
-    "inbox": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number",
-          "description": "ID of the inbox"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the inbox"
-        },
-        "website_url": {
-          "type": "string",
-          "description": "Website URL"
-        },
-        "channel_type": {
-          "type": "string",
-          "description": "The type of the inbox"
-        },
-        "avatar_url": {
-          "type": "string",
-          "description": "The avatar image of the inbox"
-        },
-        "widget_color": {
-          "type": "string",
-          "description": "Widget Color used for customization of the widget"
-        },
-        "website_token": {
-          "type": "string",
-          "description": "Website Token"
-        },
-        "enable_auto_assignment": {
-          "type": "boolean",
-          "description": "The flag which shows whether Auto Assignment is enabled or not"
-        },
-        "web_widget_script": {
-          "type": "string",
-          "description": "Script used to load the website widget"
-        },
-        "welcome_title": {
-          "type": "string",
-          "description": "Welcome title to be displayed on the widget"
-        },
-        "welcome_tagline": {
-          "type": "string",
-          "description": "Welcome tagline to be displayed on the widget"
-        },
-        "greeting_enabled": {
-          "type": "boolean",
-          "description": "The flag which shows whether greeting is enabled"
-        },
-        "greeting_message": {
-          "type": "string",
-          "description": "A greeting message when the user starts the conversation"
-        }
-      }
-    },
-    "agent_bot": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number",
-          "description": "ID of the agent bot"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the agent bot"
-        },
-        "description": {
-          "type": "string",
-          "description": "The description about the agent bot"
-        },
-        "account_id": {
-          "type": "number",
-          "description": "Account ID if it's an account specific bot"
-        },
-        "outgoing_url": {
-          "type": "string",
-          "description": "The webhook URL for the bot"
-        }
-      }
-    },
-    "contact_inboxes": {
-      "type": "object",
-      "properties": {
-        "source_id": {
-          "type": "string",
-          "description": "Contact Inbox Source Id"
-        },
-        "inbox": {
-          "$ref": "#/definitions/inbox"
-        }
-      }
-    },
-    "contactable_inboxes": {
-      "type": "object",
-      "properties": {
-        "source_id": {
-          "type": "string",
-          "description": "Contact Inbox Source Id"
-        },
-        "inbox": {
-          "$ref": "#/definitions/inbox"
-        }
-      }
-    },
-    "custom_filter": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number",
-          "description": "The ID of the custom filter"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the custom filter"
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "conversation",
-            "contact",
-            "report"
-          ],
-          "description": "The description about the custom filter"
-        },
-        "query": {
-          "type": "object",
-          "description": "A query that needs to be saved as a custom filter"
-        },
-        "created_at": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The time at which the custom filter was created"
-        },
-        "updated_at": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The time at which the custom filter was updated"
-        }
-      }
-    },
-    "webhook": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number",
-          "description": "The ID of the webhook"
-        },
-        "url": {
-          "type": "string",
-          "description": "The url to which the events will be send"
-        },
-        "subscriptions": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": [
-              "conversation_created",
-              "conversation_status_changed",
-              "conversation_updated",
-              "contact_created",
-              "contact_updated",
-              "message_created",
-              "message_updated",
-              "webwidget_triggered"
-            ]
+    }
+  },
+  "components": {
+    "schemas": {
+      "bad_request_error": {
+        "title": "data",
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string"
           },
-          "description": "The list of subscribed events"
-        },
-        "account_id": {
-          "type": "number",
-          "description": "The id of the account which the webhook object belongs to"
-        }
-      }
-    },
-    "account": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number",
-          "description": "Account ID"
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of the account"
-        },
-        "role": {
-          "type": "string",
-          "enum": [
-            "administrator",
-            "agent"
-          ],
-          "description": "The user role in the account"
-        }
-      }
-    },
-    "platform_account": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number",
-          "description": "Account ID"
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of the account"
-        }
-      }
-    },
-    "team": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number",
-          "description": "The ID of the team"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the team"
-        },
-        "description": {
-          "type": "string",
-          "description": "The description about the team"
-        },
-        "allow_auto_assign": {
-          "type": "boolean",
-          "description": "If this setting is turned on, the system would automatically assign the conversation to an agent in the team while assigning the conversation to a team"
-        },
-        "account_id": {
-          "type": "number",
-          "description": "The ID of the account with the team is a part of"
-        },
-        "is_member": {
-          "type": "boolean",
-          "description": "This field shows whether the current user is a part of the team"
-        }
-      }
-    },
-    "integrations_app": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "The ID of the integration"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the integration"
-        },
-        "description": {
-          "type": "string",
-          "description": "The description about the team"
-        },
-        "hook_type": {
-          "type": "string",
-          "description": "Whether the integration is an account or inbox integration"
-        },
-        "enabled": {
-          "type": "boolean",
-          "description": "Whether the integration is enabled for the account"
-        },
-        "allow_multiple_hooks": {
-          "type": "boolean",
-          "description": "Whether multiple hooks can be created for the integration"
-        },
-        "hooks": {
-          "type": "array",
-          "items": {
-            "type": "object"
-          },
-          "description": "If there are any hooks created for this integration"
-        }
-      }
-    },
-    "integrations_hook": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "The ID of the integration hook"
-        },
-        "app_id": {
-          "type": "string",
-          "description": "The ID of the integration app"
-        },
-        "inbox_id": {
-          "type": "string",
-          "description": "Inbox ID if its an Inbox integration"
-        },
-        "account_id": {
-          "type": "string",
-          "description": "Account ID of the integration"
-        },
-        "status": {
-          "type": "boolean",
-          "description": "Whether the integration hook is enabled for the account"
-        },
-        "hook_type": {
-          "type": "boolean",
-          "description": "Whether its an account or inbox integration hook"
-        },
-        "settings": {
-          "type": "object",
-          "description": "The associated settings for the integration"
-        }
-      }
-    },
-    "public_contact": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer",
-          "description": "Id of the contact"
-        },
-        "source_id": {
-          "type": "string",
-          "description": "The session identifier of the contact"
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of the contact"
-        },
-        "email": {
-          "type": "string",
-          "description": "Email of the contact"
-        },
-        "pubsub_token": {
-          "type": "string",
-          "description": "The token to be used to connect to chatwoot websocket"
-        }
-      }
-    },
-    "public_conversation": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer",
-          "description": "Id of the conversation"
-        },
-        "inbox_id": {
-          "type": "string",
-          "description": "The inbox id of the conversation"
-        },
-        "messages": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/message"
-          },
-          "description": "Messages in the conversation"
-        },
-        "contact": {
-          "type": "object",
-          "description": "The contact information associated to the conversation"
-        }
-      }
-    },
-    "public_message": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Id of the message"
-        },
-        "content": {
-          "type": "string",
-          "description": "Text content of the message"
-        },
-        "message_type": {
-          "type": "string",
-          "description": "Denotes the message type"
-        },
-        "content_type": {
-          "type": "string",
-          "description": "Content type of the message"
-        },
-        "content_attributes": {
-          "type": "string",
-          "description": "Additional content attributes of the message"
-        },
-        "created_at": {
-          "type": "string",
-          "description": "Created at time stamp of the message"
-        },
-        "conversation_id": {
-          "type": "string",
-          "description": "Conversation Id of the message"
-        },
-        "attachments": {
-          "type": "array",
-          "items": {
-            "type": "object"
-          },
-          "description": "Attachments if any"
-        },
-        "sender": {
-          "type": "object",
-          "description": "Details of the sender"
-        }
-      }
-    },
-    "public_inbox": {
-      "type": "object",
-      "properties": {
-        "identifier": {
-          "type": "string",
-          "description": "Inbox identifier"
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of the inbox"
-        },
-        "timezone": {
-          "type": "string",
-          "description": "The timezone defined on the inbox"
-        },
-        "working_hours": {
-          "type": "array",
-          "description": "The working hours defined on the inbox",
-          "items": {
-            "type": "object",
-            "properties": {
-              "day_of_week": {
-                "type": "integer",
-                "description": "Day of the week as a number. Sunday -> 0, Saturday -> 6"
-              },
-              "open_all_day": {
-                "type": "boolean",
-                "description": "Whether or not the business is open the whole day"
-              },
-              "closed_all_day": {
-                "type": "boolean",
-                "description": "Whether or not the business is closed the whole day"
-              },
-              "open_hour": {
-                "type": "integer",
-                "description": "Opening hour. Can be null if closed all day"
-              },
-              "open_minutes": {
-                "type": "integer",
-                "description": "Opening minute. Can be null if closed all day"
-              },
-              "close_hour": {
-                "type": "integer",
-                "description": "Closing hour. Can be null if closed all day"
-              },
-              "close_minutes": {
-                "type": "integer",
-                "description": "Closing minute. Can be null if closed all day"
-              }
+          "errors": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/request_error"
             }
           }
-        },
-        "working_hours_enabled": {
-          "type": "boolean",
-          "description": "Whether of not the working hours are enabled on the inbox"
-        },
-        "csat_survey_enabled": {
-          "type": "boolean",
-          "description": "Whether of not the Customer Satisfaction survey is enabled on the inbox"
-        },
-        "greeting_enabled": {
-          "type": "boolean",
-          "description": "Whether of not the Greeting Message is enabled on the inbox"
-        },
-        "identity_validation_enabled": {
-          "type": "boolean",
-          "description": "Whether of not the User Identity Validation is enforced on the inbox"
         }
-      }
-    },
-    "account_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "Name of the account"
-        }
-      }
-    },
-    "agent_bot_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "The name of the agent bot"
-        },
-        "description": {
-          "type": "string",
-          "description": "The description about the agent bot"
-        },
-        "outgoing_url": {
-          "type": "string",
-          "description": "The webhook URL for the bot"
-        }
-      }
-    },
-    "user_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "Name of the user"
-        },
-        "email": {
-          "type": "string",
-          "description": "Email of the user"
-        },
-        "password": {
-          "type": "string",
-          "description": "Password must contain uppercase, lowercase letters, number and a special character"
-        },
-        "custom_attributes": {
-          "type": "object",
-          "description": "Custom attributes you want to associate with the user"
-        }
-      }
-    },
-    "canned_response_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "content": {
-          "type": "string",
-          "description": "Message content for canned response"
-        },
-        "short_code": {
-          "type": "string",
-          "description": "Short Code for quick access of the canned response"
-        }
-      }
-    },
-    "custom_attribute_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "attribute_display_name": {
-          "type": "string",
-          "description": "Attribute display name"
-        },
-        "attribute_display_type": {
-          "type": "integer",
-          "description": "Attribute display type (text- 0, number- 1, currency- 2, percent- 3, link- 4, date- 5, list- 6, checkbox- 7)"
-        },
-        "attribute_description": {
-          "type": "string",
-          "description": "Attribute description"
-        },
-        "attribute_key": {
-          "type": "string",
-          "description": "Attribute unique key value"
-        },
-        "attribute_values": {
-          "type": "array",
-          "description": "Attribute values",
-          "items": {
+      },
+      "request_error": {
+        "type": "object",
+        "properties": {
+          "field": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          },
+          "code": {
             "type": "string"
           }
-        },
-        "attribute_model": {
-          "type": "integer",
-          "description": "Attribute type(conversation_attribute- 0, contact_attribute- 1)"
         }
-      }
-    },
-    "contact_create": {
-      "type": "object",
-      "required": [
-        "inbox_id"
-      ],
-      "properties": {
-        "inbox_id": {
-          "type": "number"
-        },
-        "name": {
-          "type": "string",
-          "description": "name of the contact"
-        },
-        "email": {
-          "type": "string",
-          "description": "email of the contact"
-        },
-        "phone_number": {
-          "type": "string",
-          "description": "phone number of the contact"
-        },
-        "avatar": {
-          "type": "string",
-          "format": "binary",
-          "description": "Send the form data with the avatar image binary or use the avatar_url"
-        },
-        "avatar_url": {
-          "type": "string",
-          "description": "The url to a jpeg, png file for the contact avatar"
-        },
-        "identifier": {
-          "type": "string",
-          "description": "A unique identifier for the contact in external system"
-        },
-        "custom_attributes": {
-          "type": "object",
-          "description": "An object where you can store custom attributes for contact. example {\"type\":\"customer\", \"age\":30}"
+      },
+      "generic_id": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number"
+          }
         }
-      }
-    },
-    "contact_update": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "name of the contact"
-        },
-        "email": {
-          "type": "string",
-          "description": "email of the contact"
-        },
-        "phone_number": {
-          "type": "string",
-          "description": "phone number of the contact"
-        },
-        "avatar": {
-          "type": "string",
-          "format": "binary",
-          "description": "Send the form data with the avatar image binary or use the avatar_url"
-        },
-        "avatar_url": {
-          "type": "string",
-          "description": "The url to a jpeg, png file for the contact avatar"
-        },
-        "identifier": {
-          "type": "string",
-          "description": "A unique identifier for the contact in external system"
-        },
-        "custom_attributes": {
-          "type": "object",
-          "description": "An object where you can store custom attributes for contact. example {\"type\":\"customer\", \"age\":30}"
+      },
+      "canned_response": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "ID of the canned response"
+          },
+          "content": {
+            "type": "string",
+            "description": "Message content for canned response"
+          },
+          "short_code": {
+            "type": "string",
+            "description": "Short Code for quick access of the canned response"
+          },
+          "account_id": {
+            "type": "integer",
+            "description": "Account Id"
+          }
         }
-      }
-    },
-    "conversation_message_create": {
-      "type": "object",
-      "required": [
-        "content"
-      ],
-      "properties": {
-        "content": {
-          "type": "string",
-          "description": "The content of the message"
-        },
-        "message_type": {
-          "type": "string",
-          "enum": [
-            "outgoing",
-            "incoming"
-          ]
-        },
-        "private": {
-          "type": "boolean",
-          "description": "Flag to identify if it is a private note"
-        },
-        "content_type": {
-          "type": "string",
-          "enum": [
-            "text",
-            "input_email",
-            "cards",
-            "input_select",
-            "form",
-            "article"
-          ],
-          "example": "cards",
-          "description": "if you want to create custom message types"
-        },
-        "content_attributes": {
-          "type": "object",
-          "description": "attributes based on your content type"
-        },
-        "template_params": {
-          "type": "object",
-          "description": "The template params for the message in case of whatsapp Channel",
-          "properties": {
-            "name": {
-              "type": "string",
-              "description": "Name of the template",
-              "example": "sample_issue_resolution"
-            },
-            "category": {
-              "type": "string",
-              "description": "Category of the template",
-              "example": "UTILITY"
-            },
-            "language": {
-              "type": "string",
-              "description": "Language of the template",
-              "example": "en_US"
-            },
-            "processed_params": {
+      },
+      "custom_attribute": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "Identifier"
+          },
+          "attribute_display_name": {
+            "type": "string",
+            "description": "Attribute display name"
+          },
+          "attribute_display_type": {
+            "type": "string",
+            "description": "Attribute display type (text, number, currency, percent, link, date, list, checkbox)"
+          },
+          "attribute_description": {
+            "type": "string",
+            "description": "Attribute description"
+          },
+          "attribute_key": {
+            "type": "string",
+            "description": "Attribute unique key value"
+          },
+          "attribute_values": {
+            "type": "string",
+            "description": "Attribute values"
+          },
+          "default_value": {
+            "type": "string",
+            "description": "Attribute default value"
+          },
+          "attribute_model": {
+            "type": "string",
+            "description": "Attribute type(conversation_attribute/contact_attribute)"
+          },
+          "account_id": {
+            "type": "integer",
+            "description": "Account Id"
+          }
+        }
+      },
+      "automation_rule": {
+        "type": "object",
+        "properties": {
+          "event_name": {
+            "type": "string",
+            "description": "Automation Rule event, on which we call the actions(conversation_created, conversation_updated, message_created)",
+            "enum": [
+              "conversation_created",
+              "conversation_updated",
+              "message_created"
+            ],
+            "example": "message_created"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the rule",
+            "example": "Add label on message create event"
+          },
+          "description": {
+            "type": "string",
+            "description": "Description to give more context about the rule",
+            "example": "Add label support and sales on message create event if incoming message content contains text help"
+          },
+          "active": {
+            "type": "boolean",
+            "description": "Enable/disable automation rule"
+          },
+          "actions": {
+            "type": "array",
+            "description": "Array of actions which we perform when condition matches",
+            "items": {
               "type": "object",
-              "description": "The processed param values for template variables in template",
               "example": {
-                "1": "Chatwoot"
+                "action_name": "add_label",
+                "action_params": [
+                  "support",
+                  "sales"
+                ]
+              }
+            }
+          },
+          "conditions": {
+            "type": "array",
+            "description": "Array of conditions on which conversation/message filter would work",
+            "items": {
+              "type": "object",
+              "example": {
+                "attribute_key": "content",
+                "filter_operator": "contains",
+                "values": [
+                  "help"
+                ],
+                "query_operator": "nil"
+              }
+            }
+          },
+          "account_id": {
+            "type": "integer",
+            "description": "Account Id"
+          }
+        }
+      },
+      "portal": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "archived": {
+            "type": "boolean"
+          },
+          "color": {
+            "type": "string"
+          },
+          "config": {
+            "type": "object",
+            "description": "Save information about locales, allowed_locales and default portal/help-center locale"
+          },
+          "custom_domain": {
+            "type": "string"
+          },
+          "header_text": {
+            "type": "string",
+            "description": "The text content."
+          },
+          "homepage_link": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "slug": {
+            "type": "string"
+          },
+          "page_title": {
+            "type": "string"
+          },
+          "account_id": {
+            "type": "integer"
+          },
+          "categories": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/category"
+            }
+          },
+          "articles": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/article"
+            }
+          }
+        }
+      },
+      "category": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "description": {
+            "type": "string",
+            "description": "The text content."
+          },
+          "locale": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "slug": {
+            "type": "string"
+          },
+          "position": {
+            "type": "integer"
+          },
+          "portal_id": {
+            "type": "integer"
+          },
+          "account_id": {
+            "type": "integer"
+          },
+          "associated_category_id": {
+            "type": "integer",
+            "description": "To associate similar categories to each other, e.g same category of product documentation in different languages"
+          },
+          "parent_category_id": {
+            "type": "integer",
+            "description": "To define parent category, e.g product documentation has multiple level features in sales category or in engineering category."
+          }
+        }
+      },
+      "article": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "content": {
+            "type": "string",
+            "description": "The text content."
+          },
+          "meta": {
+            "type": "object"
+          },
+          "position": {
+            "type": "integer"
+          },
+          "status": {
+            "type": "integer",
+            "enum": [
+              "draft",
+              "published",
+              "archived"
+            ]
+          },
+          "title": {
+            "type": "string"
+          },
+          "slug": {
+            "type": "string"
+          },
+          "views": {
+            "type": "integer"
+          },
+          "portal_id": {
+            "type": "integer"
+          },
+          "account_id": {
+            "type": "integer"
+          },
+          "author_id": {
+            "type": "integer"
+          },
+          "category_id": {
+            "type": "integer"
+          },
+          "folder_id": {
+            "type": "integer"
+          },
+          "associated_article_id": {
+            "type": "integer",
+            "description": "To associate similar articles to each other, e.g to provide the link for the reference."
+          }
+        }
+      },
+      "contact": {
+        "type": "object",
+        "properties": {
+          "payload": {
+            "type": "object",
+            "properties": {
+              "contact": {
+                "type": "object",
+                "properties": {
+                  "email": {
+                    "type": "string",
+                    "description": "Email address of the contact"
+                  },
+                  "name": {
+                    "type": "string",
+                    "description": "The name of the contact"
+                  },
+                  "phone_number": {
+                    "type": "string",
+                    "description": "Phone number of the contact"
+                  },
+                  "thumbnail": {
+                    "type": "string",
+                    "description": "Avatar URL of the contact"
+                  },
+                  "additional_attributes": {
+                    "type": "object",
+                    "description": "The object containing additional attributes related to the contact"
+                  },
+                  "custom_attributes": {
+                    "type": "object",
+                    "description": "The object to save custom attributes for contact, accepts custom attributes key and value",
+                    "example": {
+                      "attribute_key": "attribute_value",
+                      "signed_up_at": "dd/mm/yyyy"
+                    }
+                  },
+                  "contact_inboxes": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/contact_inboxes"
+                    }
+                  }
+                }
               }
             }
           }
         }
-      }
-    },
-    "team_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "The name of the team"
-        },
-        "description": {
-          "type": "string",
-          "description": "The description of the team"
-        },
-        "allow_auto_assign": {
-          "type": "boolean",
-          "description": "If this setting is turned on, the system would automatically assign the conversation to an agent in the team while assigning the conversation to a team"
+      },
+      "conversation": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "ID of the conversation"
+          },
+          "messages": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/message"
+            }
+          },
+          "account_id": {
+            "type": "number",
+            "description": "Account Id"
+          },
+          "inbox_id": {
+            "type": "number",
+            "description": "ID of the inbox"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "open",
+              "resolved",
+              "pending"
+            ],
+            "description": "The status of the conversation"
+          },
+          "timestamp": {
+            "type": "string",
+            "description": "The time at which conversation was created"
+          },
+          "contact_last_seen_at": {
+            "type": "string"
+          },
+          "agent_last_seen_at": {
+            "type": "string"
+          },
+          "unread_count": {
+            "type": "number",
+            "description": "The number of unread messages"
+          },
+          "additional_attributes": {
+            "type": "object",
+            "description": "The object containing additional attributes related to the conversation"
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "The object to save custom attributes for conversation, accepts custom attributes key and value",
+            "example": {
+              "attribute_key": "attribute_value",
+              "priority_conversation_number": 3
+            }
+          }
         }
-      }
-    },
-    "custom_filter_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "The name of the custom filter"
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "conversation",
-            "contact",
-            "report"
-          ],
-          "description": "The description about the custom filter"
-        },
-        "query": {
+      },
+      "message": {
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "string",
+            "description": "The text content of the message"
+          },
+          "content_type": {
+            "type": "string",
+            "enum": [
+              "text",
+              "input_select",
+              "cards",
+              "form"
+            ],
+            "description": "The type of the template message"
+          },
+          "content_attributes": {
+            "type": "object",
+            "description": "The content attributes for each content_type"
+          },
+          "message_type": {
+            "type": "string",
+            "enum": [
+              "incoming",
+              "outgoing",
+              "activity",
+              "template"
+            ],
+            "description": "The type of the message"
+          },
+          "created_at": {
+            "type": "integer",
+            "description": "The time at which message was created"
+          },
+          "private": {
+            "type": "boolean",
+            "description": "The flags which shows whether the message is private or not"
+          },
+          "attachment": {
+            "type": "object",
+            "description": "The file object attached to the image"
+          },
+          "sender": {
+            "type": "object",
+            "description": "User/Agent/AgentBot object"
+          },
+          "conversation_id": {
+            "type": "number",
+            "description": "ID of the conversation"
+          }
+        }
+      },
+      "user": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number"
+          },
+          "uid": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "available_name": {
+            "type": "string"
+          },
+          "display_name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          },
+          "account_id": {
+            "type": "number"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "agent",
+              "administrator"
+            ]
+          },
+          "confirmed": {
+            "type": "boolean"
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "Available for users who are created through platform APIs and has custom attributes associated."
+          },
+          "accounts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/account"
+            }
+          }
+        }
+      },
+      "agent": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "uid": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "available_name": {
+            "type": "string"
+          },
+          "display_name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          },
+          "account_id": {
+            "type": "integer"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "agent",
+              "administrator"
+            ]
+          },
+          "confirmed": {
+            "type": "boolean"
+          },
+          "availability_status": {
+            "type": "string",
+            "enum": [
+              "available",
+              "busy",
+              "offline"
+            ],
+            "description": "The availability status of the agent computed by Chatwoot."
+          },
+          "auto_offline": {
+            "type": "boolean",
+            "description": "Whether the availability status of agent is configured to go offline automatically when away."
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "Available for users who are created through platform APIs and has custom attributes associated."
+          }
+        }
+      },
+      "inbox": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "ID of the inbox"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the inbox"
+          },
+          "website_url": {
+            "type": "string",
+            "description": "Website URL"
+          },
+          "channel_type": {
+            "type": "string",
+            "description": "The type of the inbox"
+          },
+          "avatar_url": {
+            "type": "string",
+            "description": "The avatar image of the inbox"
+          },
+          "widget_color": {
+            "type": "string",
+            "description": "Widget Color used for customization of the widget"
+          },
+          "website_token": {
+            "type": "string",
+            "description": "Website Token"
+          },
+          "enable_auto_assignment": {
+            "type": "boolean",
+            "description": "The flag which shows whether Auto Assignment is enabled or not"
+          },
+          "web_widget_script": {
+            "type": "string",
+            "description": "Script used to load the website widget"
+          },
+          "welcome_title": {
+            "type": "string",
+            "description": "Welcome title to be displayed on the widget"
+          },
+          "welcome_tagline": {
+            "type": "string",
+            "description": "Welcome tagline to be displayed on the widget"
+          },
+          "greeting_enabled": {
+            "type": "boolean",
+            "description": "The flag which shows whether greeting is enabled"
+          },
+          "greeting_message": {
+            "type": "string",
+            "description": "A greeting message when the user starts the conversation"
+          }
+        }
+      },
+      "agent_bot": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "ID of the agent bot"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the agent bot"
+          },
+          "description": {
+            "type": "string",
+            "description": "The description about the agent bot"
+          },
+          "account_id": {
+            "type": "number",
+            "description": "Account ID if it's an account specific bot"
+          },
+          "outgoing_url": {
+            "type": "string",
+            "description": "The webhook URL for the bot"
+          }
+        }
+      },
+      "contact_inboxes": {
+        "type": "object",
+        "properties": {
+          "source_id": {
+            "type": "string",
+            "description": "Contact Inbox Source Id"
+          },
+          "inbox": {
+            "$ref": "#/components/schemas/inbox"
+          }
+        }
+      },
+      "contactable_inboxes": {
+        "type": "object",
+        "properties": {
+          "source_id": {
+            "type": "string",
+            "description": "Contact Inbox Source Id"
+          },
+          "inbox": {
+            "$ref": "#/components/schemas/inbox"
+          }
+        }
+      },
+      "custom_filter": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "The ID of the custom filter"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the custom filter"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation",
+              "contact",
+              "report"
+            ],
+            "description": "The description about the custom filter"
+          },
+          "query": {
+            "type": "object",
+            "description": "A query that needs to be saved as a custom filter"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The time at which the custom filter was created"
+          },
+          "updated_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The time at which the custom filter was updated"
+          }
+        }
+      },
+      "webhook": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "The ID of the webhook"
+          },
+          "url": {
+            "type": "string",
+            "description": "The url to which the events will be send"
+          },
+          "subscriptions": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "conversation_created",
+                "conversation_status_changed",
+                "conversation_updated",
+                "contact_created",
+                "contact_updated",
+                "message_created",
+                "message_updated",
+                "webwidget_triggered"
+              ]
+            },
+            "description": "The list of subscribed events"
+          },
+          "account_id": {
+            "type": "number",
+            "description": "The id of the account which the webhook object belongs to"
+          }
+        }
+      },
+      "account": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "Account ID"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the account"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "administrator",
+              "agent"
+            ],
+            "description": "The user role in the account"
+          }
+        }
+      },
+      "account_user": {
+        "type": "array",
+        "description": "Array of account users",
+        "items": {
           "type": "object",
-          "description": "A query that needs to be saved as a custom filter"
+          "properties": {
+            "account_id": {
+              "type": "integer",
+              "description": "The ID of the account"
+            },
+            "user_id": {
+              "type": "integer",
+              "description": "The ID of the user"
+            },
+            "role": {
+              "type": "string",
+              "description": "whether user is an administrator or agent"
+            }
+          }
         }
-      }
-    },
-    "webhook_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "url": {
-          "type": "string",
-          "description": "The url where the events should be sent"
-        },
-        "subscriptions": {
-          "type": "array",
-          "items": {
+      },
+      "platform_account": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "Account ID"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the account"
+          }
+        }
+      },
+      "team": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "The ID of the team"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the team"
+          },
+          "description": {
+            "type": "string",
+            "description": "The description about the team"
+          },
+          "allow_auto_assign": {
+            "type": "boolean",
+            "description": "If this setting is turned on, the system would automatically assign the conversation to an agent in the team while assigning the conversation to a team"
+          },
+          "account_id": {
+            "type": "number",
+            "description": "The ID of the account with the team is a part of"
+          },
+          "is_member": {
+            "type": "boolean",
+            "description": "This field shows whether the current user is a part of the team"
+          }
+        }
+      },
+      "integrations_app": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the integration"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the integration"
+          },
+          "description": {
+            "type": "string",
+            "description": "The description about the team"
+          },
+          "hook_type": {
+            "type": "string",
+            "description": "Whether the integration is an account or inbox integration"
+          },
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether the integration is enabled for the account"
+          },
+          "allow_multiple_hooks": {
+            "type": "boolean",
+            "description": "Whether multiple hooks can be created for the integration"
+          },
+          "hooks": {
+            "type": "array",
+            "items": {
+              "type": "object"
+            },
+            "description": "If there are any hooks created for this integration"
+          }
+        }
+      },
+      "integrations_hook": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the integration hook"
+          },
+          "app_id": {
+            "type": "string",
+            "description": "The ID of the integration app"
+          },
+          "inbox_id": {
+            "type": "string",
+            "description": "Inbox ID if its an Inbox integration"
+          },
+          "account_id": {
+            "type": "string",
+            "description": "Account ID of the integration"
+          },
+          "status": {
+            "type": "boolean",
+            "description": "Whether the integration hook is enabled for the account"
+          },
+          "hook_type": {
+            "type": "boolean",
+            "description": "Whether its an account or inbox integration hook"
+          },
+          "settings": {
+            "type": "object",
+            "description": "The associated settings for the integration"
+          }
+        }
+      },
+      "public_contact": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "Id of the contact"
+          },
+          "source_id": {
+            "type": "string",
+            "description": "The session identifier of the contact"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the contact"
+          },
+          "email": {
+            "type": "string",
+            "description": "Email of the contact"
+          },
+          "pubsub_token": {
+            "type": "string",
+            "description": "The token to be used to connect to chatwoot websocket"
+          }
+        }
+      },
+      "public_conversation": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "Id of the conversation"
+          },
+          "inbox_id": {
+            "type": "string",
+            "description": "The inbox id of the conversation"
+          },
+          "messages": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/message"
+            },
+            "description": "Messages in the conversation"
+          },
+          "contact": {
+            "type": "object",
+            "description": "The contact information associated to the conversation"
+          }
+        }
+      },
+      "public_message": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Id of the message"
+          },
+          "content": {
+            "type": "string",
+            "description": "Text content of the message"
+          },
+          "message_type": {
+            "type": "string",
+            "description": "Denotes the message type"
+          },
+          "content_type": {
+            "type": "string",
+            "description": "Content type of the message"
+          },
+          "content_attributes": {
+            "type": "string",
+            "description": "Additional content attributes of the message"
+          },
+          "created_at": {
+            "type": "string",
+            "description": "Created at time stamp of the message"
+          },
+          "conversation_id": {
+            "type": "string",
+            "description": "Conversation Id of the message"
+          },
+          "attachments": {
+            "type": "array",
+            "items": {
+              "type": "object"
+            },
+            "description": "Attachments if any"
+          },
+          "sender": {
+            "type": "object",
+            "description": "Details of the sender"
+          }
+        }
+      },
+      "public_inbox": {
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "type": "string",
+            "description": "Inbox identifier"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the inbox"
+          },
+          "timezone": {
+            "type": "string",
+            "description": "The timezone defined on the inbox"
+          },
+          "working_hours": {
+            "type": "array",
+            "description": "The working hours defined on the inbox",
+            "items": {
+              "type": "object",
+              "properties": {
+                "day_of_week": {
+                  "type": "integer",
+                  "description": "Day of the week as a number. Sunday -> 0, Saturday -> 6"
+                },
+                "open_all_day": {
+                  "type": "boolean",
+                  "description": "Whether or not the business is open the whole day"
+                },
+                "closed_all_day": {
+                  "type": "boolean",
+                  "description": "Whether or not the business is closed the whole day"
+                },
+                "open_hour": {
+                  "type": "integer",
+                  "description": "Opening hour. Can be null if closed all day"
+                },
+                "open_minutes": {
+                  "type": "integer",
+                  "description": "Opening minute. Can be null if closed all day"
+                },
+                "close_hour": {
+                  "type": "integer",
+                  "description": "Closing hour. Can be null if closed all day"
+                },
+                "close_minutes": {
+                  "type": "integer",
+                  "description": "Closing minute. Can be null if closed all day"
+                }
+              }
+            }
+          },
+          "working_hours_enabled": {
+            "type": "boolean",
+            "description": "Whether of not the working hours are enabled on the inbox"
+          },
+          "csat_survey_enabled": {
+            "type": "boolean",
+            "description": "Whether of not the Customer Satisfaction survey is enabled on the inbox"
+          },
+          "greeting_enabled": {
+            "type": "boolean",
+            "description": "Whether of not the Greeting Message is enabled on the inbox"
+          },
+          "identity_validation_enabled": {
+            "type": "boolean",
+            "description": "Whether of not the User Identity Validation is enforced on the inbox"
+          }
+        }
+      },
+      "account_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Name of the account",
+            "example": "My Account"
+          },
+          "locale": {
+            "type": "string",
+            "description": "The locale of the account",
+            "example": "en"
+          },
+          "domain": {
+            "type": "string",
+            "description": "The domain of the account",
+            "example": "example.com"
+          },
+          "support_email": {
+            "type": "string",
+            "description": "The support email of the account",
+            "example": "support@example.com"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "active",
+              "suspended"
+            ],
+            "description": "The status of the account",
+            "example": "active"
+          },
+          "limits": {
+            "type": "object",
+            "description": "The limits of the account",
+            "example": {
+            }
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "The custom attributes of the account",
+            "example": {
+            }
+          }
+        }
+      },
+      "account_user_create_update_payload": {
+        "type": "object",
+        "required": [
+          "user_id",
+          "role"
+        ],
+        "properties": {
+          "user_id": {
+            "type": "integer",
+            "description": "The ID of the user",
+            "example": 1
+          },
+          "role": {
+            "type": "string",
+            "description": "whether user is an administrator or agent",
+            "example": "administrator"
+          }
+        }
+      },
+      "platform_agent_bot_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the agent bot",
+            "example": "My Agent Bot"
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the agent bot",
+            "example": "This is a sample agent bot"
+          },
+          "outgoing_url": {
+            "type": "string",
+            "description": "The webhook URL for the bot",
+            "example": "https://example.com/webhook"
+          },
+          "account_id": {
+            "type": "integer",
+            "description": "The account ID to associate the agent bot with",
+            "example": 1
+          },
+          "avatar": {
+            "type": "string",
+            "format": "binary",
+            "description": "Send the form data with the avatar image binary or use the avatar_url"
+          },
+          "avatar_url": {
+            "type": "string",
+            "description": "The url to a jpeg, png file for the agent bot avatar",
+            "example": "https://example.com/avatar.png"
+          }
+        }
+      },
+      "agent_bot_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the agent bot",
+            "example": "My Agent Bot"
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the agent bot",
+            "example": "This is a sample agent bot"
+          },
+          "outgoing_url": {
+            "type": "string",
+            "description": "The webhook URL for the bot",
+            "example": "https://example.com/webhook"
+          },
+          "avatar": {
+            "type": "string",
+            "format": "binary",
+            "description": "Send the form data with the avatar image binary or use the avatar_url"
+          },
+          "avatar_url": {
+            "type": "string",
+            "description": "The url to a jpeg, png file for the agent bot avatar",
+            "example": "https://example.com/avatar.png"
+          },
+          "bot_type": {
+            "type": "integer",
+            "description": "The type of the bot (0 for webhook)",
+            "example": 0
+          },
+          "bot_config": {
+            "type": "object",
+            "description": "The configuration for the bot",
+            "example": {
+            }
+          }
+        }
+      },
+      "user_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Name of the user",
+            "example": "Daniel"
+          },
+          "display_name": {
+            "type": "string",
+            "description": "Display name of the user",
+            "example": "Dan"
+          },
+          "email": {
+            "type": "string",
+            "description": "Email of the user",
+            "example": "daniel@acme.inc"
+          },
+          "password": {
+            "type": "string",
+            "description": "Password must contain uppercase, lowercase letters, number and a special character",
+            "example": "Password2!"
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "Custom attributes you want to associate with the user",
+            "example": {
+            }
+          }
+        }
+      },
+      "canned_response_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "string",
+            "description": "Message content for canned response",
+            "example": "Hello, {{contact.name}}! Welcome to our service."
+          },
+          "short_code": {
+            "type": "string",
+            "description": "Short Code for quick access of the canned response",
+            "example": "welcome"
+          }
+        }
+      },
+      "custom_attribute_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "attribute_display_name": {
+            "type": "string",
+            "description": "Attribute display name",
+            "example": "Custom Attribute"
+          },
+          "attribute_display_type": {
+            "type": "integer",
+            "description": "Attribute display type (text- 0, number- 1, currency- 2, percent- 3, link- 4, date- 5, list- 6, checkbox- 7)",
+            "example": 0
+          },
+          "attribute_description": {
+            "type": "string",
+            "description": "Attribute description",
+            "example": "This is a custom attribute"
+          },
+          "attribute_key": {
+            "type": "string",
+            "description": "Attribute unique key value",
+            "example": "custom_attribute"
+          },
+          "attribute_values": {
+            "type": "array",
+            "description": "Attribute values",
+            "items": {
+              "type": "string"
+            },
+            "example": [
+              "value1",
+              "value2"
+            ]
+          },
+          "attribute_model": {
+            "type": "integer",
+            "description": "Attribute type(conversation_attribute- 0, contact_attribute- 1)",
+            "example": 0
+          },
+          "regex_pattern": {
+            "type": "string",
+            "description": "Regex pattern (Only applicable for type- text). The regex pattern is used to validate the attribute value(s).",
+            "example": "^[a-zA-Z0-9]+$"
+          },
+          "regex_cue": {
+            "type": "string",
+            "description": "Regex cue message (Only applicable for type- text). The cue message is shown when the regex pattern is not matched.",
+            "example": "Please enter a valid value"
+          }
+        }
+      },
+      "agent_create_payload": {
+        "type": "object",
+        "required": [
+          "name",
+          "email",
+          "role"
+        ],
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Full Name of the agent",
+            "example": "John Doe"
+          },
+          "email": {
+            "type": "string",
+            "description": "Email of the Agent",
+            "example": "john.doe@acme.inc"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "agent",
+              "administrator"
+            ],
+            "description": "Whether its administrator or agent",
+            "example": "agent"
+          },
+          "availability_status": {
+            "type": "string",
+            "enum": [
+              "available",
+              "busy",
+              "offline"
+            ],
+            "description": "The availability setting of the agent.",
+            "example": "available"
+          },
+          "auto_offline": {
+            "type": "boolean",
+            "description": "Whether the availability status of agent is configured to go offline automatically when away.",
+            "example": true
+          }
+        }
+      },
+      "agent_update_payload": {
+        "type": "object",
+        "required": [
+          "role"
+        ],
+        "properties": {
+          "role": {
+            "type": "string",
+            "enum": [
+              "agent",
+              "administrator"
+            ],
+            "description": "Whether its administrator or agent",
+            "example": "agent"
+          },
+          "availability_status": {
+            "type": "string",
+            "enum": [
+              "available",
+              "busy",
+              "offline"
+            ],
+            "description": "The availability status of the agent.",
+            "example": "available"
+          },
+          "auto_offline": {
+            "type": "boolean",
+            "description": "Whether the availability status of agent is configured to go offline automatically when away.",
+            "example": true
+          }
+        }
+      },
+      "contact_create_payload": {
+        "type": "object",
+        "required": [
+          "inbox_id"
+        ],
+        "properties": {
+          "inbox_id": {
+            "type": "number",
+            "description": "ID of the inbox to which the contact belongs",
+            "example": 1
+          },
+          "name": {
+            "type": "string",
+            "description": "name of the contact",
+            "example": "Alice"
+          },
+          "email": {
+            "type": "string",
+            "description": "email of the contact",
+            "example": "alice@acme.inc"
+          },
+          "blocked": {
+            "type": "boolean",
+            "description": "whether the contact is blocked or not",
+            "example": false
+          },
+          "phone_number": {
+            "type": "string",
+            "description": "phone number of the contact",
+            "example": "+123456789"
+          },
+          "avatar": {
+            "type": "string",
+            "format": "binary",
+            "description": "Send the form data with the avatar image binary or use the avatar_url"
+          },
+          "avatar_url": {
+            "type": "string",
+            "description": "The url to a jpeg, png file for the contact avatar",
+            "example": "https://example.com/avatar.png"
+          },
+          "identifier": {
+            "type": "string",
+            "description": "A unique identifier for the contact in external system",
+            "example": "1234567890"
+          },
+          "additional_attributes": {
+            "type": "object",
+            "description": "An object where you can store additional attributes for contact. example {\"type\":\"customer\", \"age\":30}",
+            "example": {
+              "type": "customer",
+              "age": 30
+            }
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "An object where you can store custom attributes for contact. example {\"type\":\"customer\", \"age\":30}, this should have a valid custom attribute definition.",
+            "example": {
+            }
+          }
+        }
+      },
+      "contact_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "name of the contact",
+            "example": "Alice"
+          },
+          "email": {
+            "type": "string",
+            "description": "email of the contact",
+            "example": "alice@acme.inc"
+          },
+          "blocked": {
+            "type": "boolean",
+            "description": "whether the contact is blocked or not",
+            "example": false
+          },
+          "phone_number": {
+            "type": "string",
+            "description": "phone number of the contact",
+            "example": "+123456789"
+          },
+          "avatar": {
+            "type": "string",
+            "format": "binary",
+            "description": "Send the form data with the avatar image binary or use the avatar_url"
+          },
+          "avatar_url": {
+            "type": "string",
+            "description": "The url to a jpeg, png file for the contact avatar",
+            "example": "https://example.com/avatar.png"
+          },
+          "identifier": {
+            "type": "string",
+            "description": "A unique identifier for the contact in external system",
+            "example": "1234567890"
+          },
+          "additional_attributes": {
+            "type": "object",
+            "description": "An object where you can store additional attributes for contact. example {\"type\":\"customer\", \"age\":30}",
+            "example": {
+              "type": "customer",
+              "age": 30
+            }
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "An object where you can store custom attributes for contact. example {\"type\":\"customer\", \"age\":30}, this should have a valid custom attribute definition.",
+            "example": {
+            }
+          }
+        }
+      },
+      "conversation_create_payload": {
+        "type": "object",
+        "required": [
+          "source_id",
+          "inbox_id"
+        ],
+        "properties": {
+          "source_id": {
+            "type": "string",
+            "description": "Conversation source id",
+            "example": "1234567890"
+          },
+          "inbox_id": {
+            "type": "integer",
+            "description": "Id of inbox in which the conversation is created <br/> Allowed Inbox Types: Website, Phone, Api, Email",
+            "example": 1
+          },
+          "contact_id": {
+            "type": "integer",
+            "description": "Contact Id for which conversation is created",
+            "example": 1
+          },
+          "additional_attributes": {
+            "type": "object",
+            "description": "Lets you specify attributes like browser information",
+            "example": {
+              "browser": "Chrome",
+              "browser_version": "89.0.4389.82",
+              "os": "Windows",
+              "os_version": "10"
+            }
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "The object to save custom attributes for conversation, accepts custom attributes key and value",
+            "example": {
+              "attribute_key": "attribute_value",
+              "priority_conversation_number": 3
+            }
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "open",
+              "resolved",
+              "pending"
+            ],
+            "description": "Specify the conversation whether it's pending, open, closed",
+            "example": "open"
+          },
+          "assignee_id": {
+            "type": "integer",
+            "description": "Agent Id for assigning a conversation to an agent",
+            "example": 1
+          },
+          "team_id": {
+            "type": "integer",
+            "description": "Team Id for assigning a conversation to a team\\",
+            "example": 1
+          },
+          "snoozed_until": {
+            "type": "string",
+            "format": "date-time",
+            "description": "Snoozed until date time",
+            "example": "2030-07-21T17:32:28Z"
+          },
+          "message": {
+            "type": "object",
+            "description": "The initial message to be sent to the conversation",
+            "required": [
+              "content"
+            ],
+            "properties": {
+              "content": {
+                "type": "string",
+                "description": "The content of the message",
+                "example": "Hello, how can I help you?"
+              },
+              "template_params": {
+                "type": "object",
+                "description": "The template params for the message in case of whatsapp Channel",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "description": "Name of the template",
+                    "example": "sample_issue_resolution"
+                  },
+                  "category": {
+                    "type": "string",
+                    "description": "Category of the template",
+                    "example": "UTILITY"
+                  },
+                  "language": {
+                    "type": "string",
+                    "description": "Language of the template",
+                    "example": "en_US"
+                  },
+                  "processed_params": {
+                    "type": "object",
+                    "description": "The processed param values for template variables in template",
+                    "example": {
+                      "1": "Chatwoot"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "conversation_message_create_payload": {
+        "type": "object",
+        "required": [
+          "content"
+        ],
+        "properties": {
+          "content": {
+            "type": "string",
+            "description": "The content of the message",
+            "example": "Hello, how can I help you?"
+          },
+          "message_type": {
+            "type": "string",
+            "enum": [
+              "outgoing",
+              "incoming"
+            ],
+            "description": "The type of the message",
+            "example": "outgoing"
+          },
+          "private": {
+            "type": "boolean",
+            "description": "Flag to identify if it is a private note",
+            "example": false
+          },
+          "content_type": {
+            "type": "string",
+            "enum": [
+              "text",
+              "input_email",
+              "cards",
+              "input_select",
+              "form",
+              "article"
+            ],
+            "description": "Content type of the message",
+            "example": "text"
+          },
+          "content_attributes": {
+            "type": "object",
+            "description": "Attributes based on the content type",
+            "example": {
+            }
+          },
+          "campaign_id": {
+            "type": "integer",
+            "description": "The campaign id to which the message belongs",
+            "example": 1
+          },
+          "template_params": {
+            "type": "object",
+            "description": "The template params for the message in case of whatsapp Channel",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "Name of the template",
+                "example": "sample_issue_resolution"
+              },
+              "category": {
+                "type": "string",
+                "description": "Category of the template",
+                "example": "UTILITY"
+              },
+              "language": {
+                "type": "string",
+                "description": "Language of the template",
+                "example": "en_US"
+              },
+              "processed_params": {
+                "type": "object",
+                "description": "The processed param values for template variables in template",
+                "example": {
+                  "1": "Chatwoot"
+                }
+              }
+            }
+          }
+        }
+      },
+      "inbox_create_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the inbox",
+            "example": "Support"
+          },
+          "avatar": {
+            "type": "string",
+            "format": "binary",
+            "description": "Image file for avatar"
+          },
+          "greeting_enabled": {
+            "type": "boolean",
+            "description": "Enable greeting message",
+            "example": true
+          },
+          "greeting_message": {
+            "type": "string",
+            "description": "Greeting message to be displayed on the widget",
+            "example": "Hello, how can I help you?"
+          },
+          "enable_email_collect": {
+            "type": "boolean",
+            "description": "Enable email collection",
+            "example": true
+          },
+          "csat_survey_enabled": {
+            "type": "boolean",
+            "description": "Enable CSAT survey",
+            "example": true
+          },
+          "enable_auto_assignment": {
+            "type": "boolean",
+            "description": "Enable Auto Assignment",
+            "example": true
+          },
+          "working_hours_enabled": {
+            "type": "boolean",
+            "description": "Enable working hours",
+            "example": true
+          },
+          "out_of_office_message": {
+            "type": "string",
+            "description": "Out of office message to be displayed on the widget",
+            "example": "We are currently out of office. Please leave a message and we will get back to you."
+          },
+          "timezone": {
+            "type": "string",
+            "description": "Timezone of the inbox",
+            "example": "America/New_York"
+          },
+          "allow_messages_after_resolved": {
+            "type": "boolean",
+            "description": "Allow messages after conversation is resolved",
+            "example": true
+          },
+          "lock_to_single_conversation": {
+            "type": "boolean",
+            "description": "Lock to single conversation",
+            "example": true
+          },
+          "portal_id": {
+            "type": "integer",
+            "description": "Id of the help center portal to attach to the inbox",
+            "example": 1
+          },
+          "sender_name_type": {
+            "type": "string",
+            "description": "Sender name type for the inbox",
+            "enum": [
+              "friendly",
+              "professional"
+            ],
+            "example": "friendly"
+          },
+          "business_name": {
+            "type": "string",
+            "description": "Business name for the inbox",
+            "example": "My Business"
+          },
+          "channel": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Type of the channel",
+                "enum": [
+                  "web_widget",
+                  "api",
+                  "email",
+                  "line",
+                  "telegram",
+                  "whatsapp",
+                  "sms"
+                ],
+                "example": "web_widget"
+              },
+              "website_url": {
+                "type": "string",
+                "description": "URL at which the widget will be loaded",
+                "example": "https://example.com"
+              },
+              "welcome_title": {
+                "type": "string",
+                "description": "Welcome title to be displayed on the widget",
+                "example": "Welcome to our support"
+              },
+              "welcome_tagline": {
+                "type": "string",
+                "description": "Welcome tagline to be displayed on the widget",
+                "example": "We are here to help you"
+              },
+              "widget_color": {
+                "type": "string",
+                "description": "A Hex-color string used to customize the widget",
+                "example": "#FF5733"
+              }
+            }
+          }
+        }
+      },
+      "inbox_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the inbox",
+            "example": "Support"
+          },
+          "avatar": {
+            "type": "string",
+            "format": "binary",
+            "description": "Image file for avatar"
+          },
+          "greeting_enabled": {
+            "type": "boolean",
+            "description": "Enable greeting message",
+            "example": true
+          },
+          "greeting_message": {
+            "type": "string",
+            "description": "Greeting message to be displayed on the widget",
+            "example": "Hello, how can I help you?"
+          },
+          "enable_email_collect": {
+            "type": "boolean",
+            "description": "Enable email collection",
+            "example": true
+          },
+          "csat_survey_enabled": {
+            "type": "boolean",
+            "description": "Enable CSAT survey",
+            "example": true
+          },
+          "enable_auto_assignment": {
+            "type": "boolean",
+            "description": "Enable Auto Assignment",
+            "example": true
+          },
+          "working_hours_enabled": {
+            "type": "boolean",
+            "description": "Enable working hours",
+            "example": true
+          },
+          "out_of_office_message": {
+            "type": "string",
+            "description": "Out of office message to be displayed on the widget",
+            "example": "We are currently out of office. Please leave a message and we will get back to you."
+          },
+          "timezone": {
+            "type": "string",
+            "description": "Timezone of the inbox",
+            "example": "America/New_York"
+          },
+          "allow_messages_after_resolved": {
+            "type": "boolean",
+            "description": "Allow messages after conversation is resolved",
+            "example": true
+          },
+          "lock_to_single_conversation": {
+            "type": "boolean",
+            "description": "Lock to single conversation",
+            "example": true
+          },
+          "portal_id": {
+            "type": "integer",
+            "description": "Id of the help center portal to attach to the inbox",
+            "example": 1
+          },
+          "sender_name_type": {
+            "type": "string",
+            "description": "Sender name type for the inbox",
+            "enum": [
+              "friendly",
+              "professional"
+            ],
+            "example": "friendly"
+          },
+          "business_name": {
+            "type": "string",
+            "description": "Business name for the inbox",
+            "example": "My Business"
+          },
+          "channel": {
+            "type": "object",
+            "properties": {
+              "website_url": {
+                "type": "string",
+                "description": "URL at which the widget will be loaded",
+                "example": "https://example.com"
+              },
+              "welcome_title": {
+                "type": "string",
+                "description": "Welcome title to be displayed on the widget",
+                "example": "Welcome to our support"
+              },
+              "welcome_tagline": {
+                "type": "string",
+                "description": "Welcome tagline to be displayed on the widget",
+                "example": "We are here to help you"
+              },
+              "widget_color": {
+                "type": "string",
+                "description": "A Hex-color string used to customize the widget",
+                "example": "#FF5733"
+              }
+            }
+          }
+        }
+      },
+      "team_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the team",
+            "example": "Support Team"
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the team",
+            "example": "This is a team of support agents"
+          },
+          "allow_auto_assign": {
+            "type": "boolean",
+            "description": "If this setting is turned on, the system would automatically assign the conversation to an agent in the team while assigning the conversation to a team",
+            "example": true
+          }
+        }
+      },
+      "custom_filter_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the custom filter",
+            "example": "My Custom Filter"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation",
+              "contact",
+              "report"
+            ],
+            "description": "The description about the custom filter",
+            "example": "conversation"
+          },
+          "query": {
+            "type": "object",
+            "description": "A query that needs to be saved as a custom filter",
+            "example": {
+            }
+          }
+        }
+      },
+      "webhook_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string",
+            "description": "The url where the events should be sent",
+            "example": "https://example.com/webhook"
+          },
+          "subscriptions": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "conversation_created",
+                "conversation_status_changed",
+                "conversation_updated",
+                "message_created",
+                "message_updated",
+                "contact_created",
+                "contact_updated",
+                "webwidget_triggered"
+              ]
+            },
+            "description": "The events you want to subscribe to.",
+            "example": [
+              "conversation_created",
+              "conversation_status_changed"
+            ]
+          }
+        }
+      },
+      "integrations_hook_create_payload": {
+        "type": "object",
+        "properties": {
+          "app_id": {
+            "type": "integer",
+            "description": "The ID of app for which integration hook is being created",
+            "example": 1
+          },
+          "inbox_id": {
+            "type": "integer",
+            "description": "The inbox ID, if the hook is an inbox hook",
+            "example": 1
+          },
+          "status": {
+            "type": "integer",
+            "description": "The status of the integration (0 for inactive, 1 for active)",
+            "example": 1
+          },
+          "settings": {
+            "type": "object",
+            "description": "The settings required by the integration",
+            "example": {
+            }
+          }
+        }
+      },
+      "integrations_hook_update_payload": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "integer",
+            "description": "The status of the integration (0 for inactive, 1 for active)",
+            "example": 1
+          },
+          "settings": {
+            "type": "object",
+            "description": "The settings required by the integration",
+            "example": {
+            }
+          }
+        }
+      },
+      "automation_rule_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Rule name",
+            "example": "Add label on message create event"
+          },
+          "description": {
+            "type": "string",
+            "description": "The description about the automation and actions",
+            "example": "Add label support and sales on message create event if incoming message content contains text help"
+          },
+          "event_name": {
             "type": "string",
             "enum": [
               "conversation_created",
-              "conversation_status_changed",
               "conversation_updated",
-              "message_created",
-              "message_updated",
-              "webwidget_triggered"
-            ]
+              "message_created"
+            ],
+            "example": "message_created",
+            "description": "The event when you want to execute the automation actions"
           },
-          "description": "The events you want to subscribe to."
-        }
-      }
-    },
-    "integrations_hook_create_payload": {
-      "type": "object",
-      "properties": {
-        "app_id": {
-          "type": "string",
-          "description": "The ID of app for which integration hook is being created"
-        },
-        "inbox_id": {
-          "type": "string",
-          "description": "The inbox ID, if the hook is an inbox hook"
-        },
-        "settings": {
-          "type": "object",
-          "description": "The settings required by the integration"
-        }
-      }
-    },
-    "integrations_hook_update_payload": {
-      "type": "object",
-      "properties": {
-        "settings": {
-          "type": "object",
-          "description": "The settings required by the integration"
-        }
-      }
-    },
-    "automation_rule_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "Rule name",
-          "example": "Add label on message create event"
-        },
-        "description": {
-          "type": "string",
-          "description": "The description about the automation and actions",
-          "example": "Add label support and sales on message create event if incoming message content contains text help"
-        },
-        "event_name": {
-          "type": "string",
-          "enum": [
-            "conversation_created",
-            "conversation_updated",
-            "message_created"
-          ],
-          "example": "message_created",
-          "description": "The event when you want to execute the automation actions"
-        },
-        "active": {
-          "type": "boolean",
-          "description": "Enable/disable automation rule"
-        },
-        "actions": {
-          "type": "array",
-          "description": "Array of actions which you want to perform when condition matches, e.g add label support if message contains content help.",
-          "items": {
-            "type": "object",
-            "example": {
-              "action_name": "add_label",
-              "action_params": [
-                "support"
-              ]
+          "active": {
+            "type": "boolean",
+            "description": "Enable/disable automation rule"
+          },
+          "actions": {
+            "type": "array",
+            "description": "Array of actions which you want to perform when condition matches, e.g add label support if message contains content help.",
+            "items": {
+              "type": "object",
+              "example": {
+                "action_name": "add_label",
+                "action_params": [
+                  "support"
+                ]
+              }
             }
-          }
-        },
-        "conditions": {
-          "type": "array",
-          "description": "Array of conditions on which conversation filter would work, e.g message content contains text help.",
-          "items": {
-            "type": "object",
-            "example": {
-              "attribute_key": "content",
-              "filter_operator": "contains",
-              "query_operator": "nil",
-              "values": [
-                "help"
-              ]
+          },
+          "conditions": {
+            "type": "array",
+            "description": "Array of conditions on which conversation filter would work, e.g message content contains text help.",
+            "items": {
+              "type": "object",
+              "example": {
+                "attribute_key": "content",
+                "filter_operator": "contains",
+                "query_operator": "OR",
+                "values": [
+                  "help"
+                ]
+              }
             }
           }
         }
-      }
-    },
-    "portal_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "archived": {
-          "type": "boolean",
-          "description": "Status to check if portal is live"
-        },
-        "color": {
-          "type": "string",
-          "description": "Header color for help-center",
-          "example": "add color HEX string, \"#fffff\""
-        },
-        "config": {
-          "type": "object",
-          "description": "Configuration about supporting locales",
-          "example": {
-            "allowed_locales": [
-              "en",
-              "es"
-            ],
-            "default_locale": "en"
-          }
-        },
-        "custom_domain": {
-          "type": "string",
-          "description": "Custom domain to  display help center.",
-          "example": "https://chatwoot.help/."
-        },
-        "header_text": {
-          "type": "string",
-          "description": "Help center header",
-          "example": "Handbook"
-        },
-        "homepage_link": {
-          "type": "string",
-          "description": "link to main dashboard",
-          "example": "https://www.chatwoot.com/"
-        },
-        "name": {
-          "type": "string",
-          "description": "Name for the portal"
-        },
-        "slug": {
-          "type": "string",
-          "description": "Slug for the portal to display in link"
-        },
-        "page_title": {
-          "type": "string",
-          "description": "Page title for the portal"
-        },
-        "account_id": {
-          "type": "integer"
-        }
-      }
-    },
-    "category_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "description": {
-          "type": "string",
-          "description": "Category description"
-        },
-        "locale": {
-          "type": "string",
-          "description": "Category locale",
-          "example": "en/es"
-        },
-        "name": {
-          "type": "string",
-          "description": "Category name"
-        },
-        "slug": {
-          "type": "string",
-          "description": "Category slug"
-        },
-        "position": {
-          "type": "integer",
-          "description": "Category position in the portal list to sort"
-        },
-        "portal_id": {
-          "type": "integer"
-        },
-        "account_id": {
-          "type": "integer"
-        },
-        "associated_category_id": {
-          "type": "integer",
-          "description": "To associate similar categories to each other, e.g same category of product documentation in different languages"
-        },
-        "parent_category_id": {
-          "type": "integer",
-          "description": "To define parent category, e.g product documentation has multiple level features in sales category or in engineering category."
-        }
-      }
-    },
-    "article_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "content": {
-          "type": "string",
-          "description": "The text content."
-        },
-        "meta": {
-          "type": "object",
-          "description": "Use for search",
-          "example": {
-            "tags": [
-              "article_name"
-            ],
-            "title": "article title",
-            "description": "article description"
-          }
-        },
-        "position": {
-          "type": "integer",
-          "description": "article position in category"
-        },
-        "status": {
-          "type": "integer",
-          "example": [
-            "draft",
-            "published",
-            "archived"
-          ]
-        },
-        "title": {
-          "type": "string"
-        },
-        "slug": {
-          "type": "string"
-        },
-        "views": {
-          "type": "integer"
-        },
-        "portal_id": {
-          "type": "integer"
-        },
-        "account_id": {
-          "type": "integer"
-        },
-        "author_id": {
-          "type": "integer"
-        },
-        "category_id": {
-          "type": "integer"
-        },
-        "folder_id": {
-          "type": "integer"
-        },
-        "associated_article_id": {
-          "type": "integer",
-          "description": "To associate similar articles to each other, e.g to provide the link for the reference."
-        }
-      }
-    },
-    "public_contact_create_update_payload": {
-      "type": "object",
-      "properties": {
-        "identifier": {
-          "type": "string",
-          "description": "External identifier of the contact"
-        },
-        "identifier_hash": {
-          "type": "string",
-          "description": "Identifier hash prepared for HMAC authentication"
-        },
-        "email": {
-          "type": "string",
-          "description": "Email of the contact"
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of the contact"
-        },
-        "phone_number": {
-          "type": "string",
-          "description": "Phone number of the contact"
-        },
-        "avatar_url": {
-          "type": "string",
-          "description": "The url to a jpeg, png file for the user avatar"
-        },
-        "custom_attributes": {
-          "type": "object",
-          "description": "Custom attributes of the customer"
-        }
-      }
-    },
-    "public_message_create_payload": {
-      "type": "object",
-      "properties": {
-        "content": {
-          "type": "string",
-          "description": "Content for the message"
-        },
-        "echo_id": {
-          "type": "string",
-          "description": "Temporary identifier which will be passed back via websockets"
-        }
-      }
-    },
-    "public_message_update_payload": {
-      "type": "object",
-      "properties": {
-        "submitted_values": {
-          "type": "object",
-          "description": "Replies to the Bot Message Types"
-        }
-      }
-    },
-    "public_conversation_create_payload": {
-      "type": "object",
-      "properties": {
-        "custom_attributes": {
-          "type": "object",
-          "description": "Custom attributes of the conversation"
-        }
-      }
-    },
-    "extended_contact": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/contact"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "Id of the user"
-            },
-            "availability_status": {
-              "type": "string",
-              "enum": [
-                "online",
-                "offline"
+      },
+      "portal_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "color": {
+            "type": "string",
+            "description": "Header color for help-center in hex format",
+            "example": "#FFFFFF"
+          },
+          "custom_domain": {
+            "type": "string",
+            "description": "Custom domain to display help center.",
+            "example": "chatwoot.help"
+          },
+          "header_text": {
+            "type": "string",
+            "description": "Help center header",
+            "example": "Handbook"
+          },
+          "homepage_link": {
+            "type": "string",
+            "description": "link to main dashboard",
+            "example": "https://www.chatwoot.com/"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name for the portal",
+            "example": "Handbook"
+          },
+          "page_title": {
+            "type": "string",
+            "description": "Page title for the portal",
+            "example": "Handbook"
+          },
+          "slug": {
+            "type": "string",
+            "description": "Slug for the portal to display in link",
+            "example": "handbook"
+          },
+          "archived": {
+            "type": "boolean",
+            "description": "Status to check if portal is live",
+            "example": false
+          },
+          "config": {
+            "type": "object",
+            "description": "Configuration about supporting locales",
+            "example": {
+              "allowed_locales": [
+                "en",
+                "es"
               ],
-              "description": "Availability status of the user"
+              "default_locale": "en"
             }
           }
         }
-      ]
-    },
-    "contact_base": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/generic_id"
-        },
-        {
-          "$ref": "#/definitions/contact"
+      },
+      "category_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the category",
+            "example": "Category Name"
+          },
+          "description": {
+            "type": "string",
+            "description": "A description for the category",
+            "example": "Category description"
+          },
+          "position": {
+            "type": "integer",
+            "description": "Category position in the portal list to sort",
+            "example": 1
+          },
+          "slug": {
+            "type": "string",
+            "description": "The category slug used in the URL",
+            "example": "category-name"
+          },
+          "locale": {
+            "type": "string",
+            "description": "The locale of the category",
+            "example": "en"
+          },
+          "icon": {
+            "type": "string",
+            "description": "The icon of the category as a string (emoji)",
+            "example": "📚"
+          },
+          "parent_category_id": {
+            "type": "integer",
+            "description": "To define parent category, e.g product documentation has multiple level features in sales category or in engineering category.",
+            "example": 1
+          },
+          "associated_category_id": {
+            "type": "integer",
+            "description": "To associate similar categories to each other, e.g same category of product documentation in different languages",
+            "example": 2
+          }
         }
-      ]
-    },
-    "contact_list": {
-      "type": "array",
-      "description": "array of contacts",
-      "items": {
+      },
+      "article_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "string",
+            "description": "The title of the article",
+            "example": "Article Title"
+          },
+          "slug": {
+            "type": "string",
+            "description": "The slug of the article",
+            "example": "article-title"
+          },
+          "position": {
+            "type": "integer",
+            "description": "article position in category",
+            "example": 1
+          },
+          "content": {
+            "type": "string",
+            "description": "The text content.",
+            "example": "This is the content of the article"
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the article",
+            "example": "This is the description of the article"
+          },
+          "category_id": {
+            "type": "integer",
+            "description": "The category id of the article",
+            "example": 1
+          },
+          "author_id": {
+            "type": "integer",
+            "description": "The author agent id of the article",
+            "example": 1
+          },
+          "associated_article_id": {
+            "type": "integer",
+            "description": "To associate similar articles to each other, e.g to provide the link for the reference.",
+            "example": 2
+          },
+          "status": {
+            "type": "integer",
+            "description": "The status of the article. 0 for draft, 1 for published, 2 for archived",
+            "example": 1
+          },
+          "locale": {
+            "type": "string",
+            "description": "The locale of the article",
+            "example": "en"
+          },
+          "meta": {
+            "type": "object",
+            "description": "Use for search",
+            "example": {
+              "tags": [
+                "article_name"
+              ],
+              "title": "article title",
+              "description": "article description"
+            }
+          }
+        }
+      },
+      "public_contact_create_update_payload": {
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "type": "string",
+            "description": "External identifier of the contact",
+            "example": "1234567890"
+          },
+          "identifier_hash": {
+            "type": "string",
+            "description": "Identifier hash prepared for HMAC authentication",
+            "example": "e93275d4eba0e5679ad55f5360af00444e2a888df9b0afa3e8b691c3173725f9"
+          },
+          "email": {
+            "type": "string",
+            "description": "Email of the contact",
+            "example": "alice@acme.inc"
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the contact",
+            "example": "Alice"
+          },
+          "phone_number": {
+            "type": "string",
+            "description": "Phone number of the contact",
+            "example": "+123456789"
+          },
+          "avatar": {
+            "type": "string",
+            "format": "binary",
+            "description": "Send the form data with the avatar image binary or use the avatar_url"
+          },
+          "custom_attributes": {
+            "type": "object",
+            "description": "Custom attributes of the customer",
+            "example": {
+            }
+          }
+        }
+      },
+      "public_message_create_payload": {
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "string",
+            "description": "Content for the message",
+            "example": "Hello, how can I help you?"
+          },
+          "echo_id": {
+            "type": "string",
+            "description": "Temporary identifier which will be passed back via websockets",
+            "example": "1234567890"
+          }
+        }
+      },
+      "public_message_update_payload": {
+        "type": "object",
+        "properties": {
+          "submitted_values": {
+            "type": "object",
+            "description": "Replies to the Bot Message Types",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the submiitted value",
+                "example": "My Name"
+              },
+              "title": {
+                "type": "string",
+                "description": "The title of the submitted value",
+                "example": "My Title"
+              },
+              "value": {
+                "type": "string",
+                "description": "The value of the submitted value",
+                "example": "value"
+              },
+              "csat_survey_response": {
+                "type": "object",
+                "description": "The CSAT survey response",
+                "properties": {
+                  "feedback_message": {
+                    "type": "string",
+                    "description": "The feedback message of the CSAT survey response",
+                    "example": "Great service!"
+                  },
+                  "rating": {
+                    "type": "integer",
+                    "description": "The rating of the CSAT survey response",
+                    "example": 5
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "public_conversation_create_payload": {
+        "type": "object",
+        "properties": {
+          "custom_attributes": {
+            "type": "object",
+            "description": "Custom attributes of the conversation",
+            "example": {
+            }
+          }
+        }
+      },
+      "extended_contact": {
         "allOf": [
           {
-            "$ref": "#/definitions/generic_id"
+            "$ref": "#/components/schemas/contact"
           },
           {
-            "$ref": "#/definitions/contact"
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "number",
+                "description": "Id of the user"
+              },
+              "availability_status": {
+                "type": "string",
+                "enum": [
+                  "online",
+                  "offline"
+                ],
+                "description": "Availability status of the user"
+              }
+            }
           }
         ]
-      }
-    },
-    "contact_conversations": {
-      "type": "array",
-      "description": "array of conversations",
-      "items": {
+      },
+      "contact_base": {
         "allOf": [
           {
-            "$ref": "#/definitions/conversation"
+            "$ref": "#/components/schemas/generic_id"
+          },
+          {
+            "$ref": "#/components/schemas/contact"
+          }
+        ]
+      },
+      "contact_list": {
+        "type": "array",
+        "description": "array of contacts",
+        "items": {
+          "allOf": [
+            {
+              "$ref": "#/components/schemas/generic_id"
+            },
+            {
+              "$ref": "#/components/schemas/contact"
+            }
+          ]
+        }
+      },
+      "contact_conversations": {
+        "type": "array",
+        "description": "array of conversations",
+        "items": {
+          "allOf": [
+            {
+              "$ref": "#/components/schemas/conversation"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "meta": {
+                  "type": "object",
+                  "properties": {
+                    "sender": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "number",
+                          "description": "ID fo the sender"
+                        },
+                        "name": {
+                          "type": "string",
+                          "description": "The name of the sender"
+                        },
+                        "thumbnail": {
+                          "type": "string",
+                          "description": "Avatar URL of the contact"
+                        },
+                        "channel": {
+                          "type": "string",
+                          "description": "Channel Type"
+                        }
+                      }
+                    },
+                    "assignee": {
+                      "$ref": "#/components/schemas/user"
+                    }
+                  }
+                }
+              }
+            },
+            {
+              "type": "object",
+              "properties": {
+                "display_id": {
+                  "type": "number"
+                }
+              }
+            }
+          ]
+        }
+      },
+      "contact_labels": {
+        "type": "object",
+        "properties": {
+          "payload": {
+            "type": "array",
+            "description": "Array of labels",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "conversation_list": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "meta": {
+                "type": "object",
+                "properties": {
+                  "mine_count": {
+                    "type": "number"
+                  },
+                  "unassigned_count": {
+                    "type": "number"
+                  },
+                  "assigned_count": {
+                    "type": "number"
+                  },
+                  "all_count": {
+                    "type": "number"
+                  }
+                }
+              },
+              "payload": {
+                "type": "array",
+                "description": "array of conversations",
+                "items": {
+                  "allOf": [
+                    {
+                      "$ref": "#/components/schemas/generic_id"
+                    },
+                    {
+                      "$ref": "#/components/schemas/conversation"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "meta": {
+                          "type": "object",
+                          "properties": {
+                            "sender": {
+                              "type": "object",
+                              "properties": {
+                                "id": {
+                                  "type": "number",
+                                  "description": "ID fo the sender"
+                                },
+                                "name": {
+                                  "type": "string",
+                                  "description": "The name of the sender"
+                                },
+                                "thumbnail": {
+                                  "type": "string",
+                                  "description": "Avatar URL of the contact"
+                                },
+                                "channel": {
+                                  "type": "string",
+                                  "description": "Channel Type"
+                                }
+                              }
+                            },
+                            "assignee": {
+                              "$ref": "#/components/schemas/user"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        }
+      },
+      "conversation_show": {
+        "type": "object",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/conversation"
           },
           {
             "type": "object",
@@ -7133,427 +10026,348 @@
                     }
                   },
                   "assignee": {
-                    "$ref": "#/definitions/user"
+                    "$ref": "#/components/schemas/user"
                   }
                 }
               }
             }
-          },
-          {
-            "type": "object",
-            "properties": {
-              "display_id": {
-                "type": "number"
-              }
-            }
           }
         ]
-      }
-    },
-    "contact_labels": {
-      "type": "object",
-      "properties": {
-        "payload": {
-          "type": "array",
-          "description": "Array of labels",
-          "items": {
-            "type": "string"
-          }
-        }
-      }
-    },
-    "conversation_list": {
-      "type": "object",
-      "properties": {
-        "data": {
-          "type": "object",
-          "properties": {
-            "meta": {
-              "type": "object",
-              "properties": {
-                "mine_count": {
-                  "type": "number"
-                },
-                "unassigned_count": {
-                  "type": "number"
-                },
-                "assigned_count": {
-                  "type": "number"
-                },
-                "all_count": {
-                  "type": "number"
-                }
-              }
-            },
-            "payload": {
-              "type": "array",
-              "description": "array of conversations",
-              "items": {
-                "allOf": [
-                  {
-                    "$ref": "#/definitions/generic_id"
-                  },
-                  {
-                    "$ref": "#/definitions/conversation"
-                  },
-                  {
-                    "type": "object",
-                    "properties": {
-                      "meta": {
-                        "type": "object",
-                        "properties": {
-                          "sender": {
-                            "type": "object",
-                            "properties": {
-                              "id": {
-                                "type": "number",
-                                "description": "ID fo the sender"
-                              },
-                              "name": {
-                                "type": "string",
-                                "description": "The name of the sender"
-                              },
-                              "thumbnail": {
-                                "type": "string",
-                                "description": "Avatar URL of the contact"
-                              },
-                              "channel": {
-                                "type": "string",
-                                "description": "Channel Type"
-                              }
-                            }
-                          },
-                          "assignee": {
-                            "$ref": "#/definitions/user"
-                          }
-                        }
-                      }
-                    }
-                  }
+      },
+      "conversation_status_toggle": {
+        "type": "object",
+        "properties": {
+          "meta": {
+            "type": "object"
+          },
+          "payload": {
+            "type": "object",
+            "properties": {
+              "success": {
+                "type": "boolean"
+              },
+              "current_status": {
+                "type": "string",
+                "enum": [
+                  "open",
+                  "resolved"
                 ]
+              },
+              "conversation_id": {
+                "type": "number"
               }
             }
           }
         }
-      }
-    },
-    "conversation_show": {
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/conversation"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "meta": {
-              "type": "object",
-              "properties": {
-                "sender": {
-                  "type": "object",
-                  "properties": {
-                    "id": {
-                      "type": "number",
-                      "description": "ID fo the sender"
-                    },
-                    "name": {
-                      "type": "string",
-                      "description": "The name of the sender"
-                    },
-                    "thumbnail": {
-                      "type": "string",
-                      "description": "Avatar URL of the contact"
-                    },
-                    "channel": {
-                      "type": "string",
-                      "description": "Channel Type"
-                    }
-                  }
-                },
-                "assignee": {
-                  "$ref": "#/definitions/user"
-                }
-              }
+      },
+      "conversation_labels": {
+        "type": "object",
+        "properties": {
+          "payload": {
+            "type": "array",
+            "description": "Array of labels",
+            "items": {
+              "type": "string"
             }
           }
         }
-      ]
-    },
-    "conversation_status_toggle": {
-      "type": "object",
-      "properties": {
-        "meta": {
-          "type": "object"
-        },
-        "payload": {
-          "type": "object",
-          "properties": {
-            "success": {
-              "type": "boolean"
-            },
-            "current_status": {
-              "type": "string",
-              "enum": [
-                "open",
-                "resolved"
-              ]
-            },
-            "conversation_id": {
-              "type": "number"
-            }
-          }
-        }
-      }
-    },
-    "conversation_labels": {
-      "type": "object",
-      "properties": {
-        "payload": {
-          "type": "array",
-          "description": "Array of labels",
-          "items": {
+      },
+      "account_summary": {
+        "type": "object",
+        "properties": {
+          "avg_first_response_time": {
             "type": "string"
+          },
+          "avg_resolution_time": {
+            "type": "string"
+          },
+          "conversations_count": {
+            "type": "number"
+          },
+          "incoming_messages_count": {
+            "type": "number"
+          },
+          "outgoing_messages_count": {
+            "type": "number"
+          },
+          "resolutions_count": {
+            "type": "number"
+          },
+          "previous": {
+            "type": "object",
+            "properties": {
+              "avg_first_response_time": {
+                "type": "string"
+              },
+              "avg_resolution_time": {
+                "type": "string"
+              },
+              "conversations_count": {
+                "type": "number"
+              },
+              "incoming_messages_count": {
+                "type": "number"
+              },
+              "outgoing_messages_count": {
+                "type": "number"
+              },
+              "resolutions_count": {
+                "type": "number"
+              }
+            }
           }
         }
-      }
-    },
-    "account_summary": {
-      "type": "object",
-      "properties": {
-        "avg_first_response_time": {
-          "type": "string"
-        },
-        "avg_resolution_time": {
-          "type": "string"
-        },
-        "conversations_count": {
-          "type": "number"
-        },
-        "incoming_messages_count": {
-          "type": "number"
-        },
-        "outgoing_messages_count": {
-          "type": "number"
-        },
-        "resolutions_count": {
-          "type": "number"
-        },
-        "previous": {
-          "type": "object",
-          "properties": {
-            "avg_first_response_time": {
-              "type": "string"
-            },
-            "avg_resolution_time": {
-              "type": "string"
-            },
-            "conversations_count": {
-              "type": "number"
-            },
-            "incoming_messages_count": {
-              "type": "number"
-            },
-            "outgoing_messages_count": {
-              "type": "number"
-            },
-            "resolutions_count": {
-              "type": "number"
+      },
+      "agent_conversation_metrics": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number"
+          },
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          },
+          "thumbnail": {
+            "type": "string"
+          },
+          "availability": {
+            "type": "string"
+          },
+          "metric": {
+            "type": "object",
+            "properties": {
+              "open": {
+                "type": "number"
+              },
+              "unattended": {
+                "type": "number"
+              }
             }
           }
         }
       }
     },
-    "agent_conversation_metrics": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "number"
+    "parameters": {
+      "account_id": {
+        "in": "path",
+        "name": "account_id",
+        "schema": {
+          "type": "integer"
         },
-        "name": {
+        "required": true,
+        "description": "The numeric ID of the account"
+      },
+      "agent_bot_id": {
+        "in": "path",
+        "name": "id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The ID of the agentbot to be updated"
+      },
+      "team_id": {
+        "in": "path",
+        "name": "team_id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The ID of the team to be updated"
+      },
+      "inbox_id": {
+        "in": "path",
+        "name": "inbox_id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The ID of the Inbox"
+      },
+      "hook_id": {
+        "in": "path",
+        "name": "hook_id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The numeric ID of the integration hook"
+      },
+      "source_id": {
+        "in": "path",
+        "name": "source_id",
+        "required": true,
+        "schema": {
           "type": "string"
         },
-        "email": {
+        "description": "Id of the session for which the conversation is created.\n\n\n\n Source Ids can be obtained through contactable inboxes API or via generated.<br/><br/>Website: Chatwoot generated string which can be obtained from webhook events. <br/> Phone Channels(Twilio): Phone number in e164 format <br/> Email Channels: Contact Email address <br/> API Channel: Any Random String"
+      },
+      "contact_sort_param": {
+        "in": "query",
+        "name": "sort",
+        "schema": {
+          "type": "string",
+          "enum": [
+            "name",
+            "email",
+            "phone_number",
+            "last_activity_at",
+            "-name",
+            "-email",
+            "-phone_number",
+            "-last_activity_at"
+          ]
+        },
+        "required": false,
+        "description": "The attribute by which list should be sorted"
+      },
+      "conversation_id": {
+        "in": "path",
+        "name": "conversation_id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The numeric ID of the conversation"
+      },
+      "conversation_uuid": {
+        "in": "path",
+        "name": "conversation_uuid",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The uuid of the conversation"
+      },
+      "custom_filter_id": {
+        "in": "path",
+        "name": "custom_filter_id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The numeric ID of the custom filter"
+      },
+      "webhook_id": {
+        "in": "path",
+        "name": "webhook_id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The numeric ID of the webhook"
+      },
+      "message_id": {
+        "in": "path",
+        "name": "message_id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The numeric ID of the message"
+      },
+      "page": {
+        "in": "query",
+        "name": "page",
+        "schema": {
+          "type": "integer",
+          "default": 1
+        },
+        "required": false,
+        "description": "The page parameter"
+      },
+      "platform_user_id": {
+        "in": "path",
+        "name": "id",
+        "schema": {
+          "type": "integer"
+        },
+        "required": true,
+        "description": "The numeric ID of the user on the platform"
+      },
+      "report_type": {
+        "in": "query",
+        "name": "type",
+        "schema": {
+          "type": "string",
+          "enum": [
+            "account",
+            "agent",
+            "inbox",
+            "label",
+            "team"
+          ]
+        },
+        "required": true,
+        "description": "Type of report"
+      },
+      "report_metric": {
+        "in": "query",
+        "name": "metric",
+        "schema": {
+          "type": "string",
+          "enum": [
+            "conversations_count",
+            "incoming_messages_count",
+            "outgoing_messages_count",
+            "avg_first_response_time",
+            "avg_resolution_time",
+            "resolutions_count"
+          ]
+        },
+        "required": true,
+        "description": "The type of metric"
+      },
+      "public_inbox_identifier": {
+        "in": "path",
+        "name": "inbox_identifier",
+        "schema": {
           "type": "string"
         },
-        "thumbnail": {
+        "required": true,
+        "description": "The identifier obtained from API inbox channel"
+      },
+      "public_contact_identifier": {
+        "in": "path",
+        "name": "contact_identifier",
+        "schema": {
           "type": "string"
         },
-        "availability": {
+        "required": true,
+        "description": "The source id of contact obtained on contact create"
+      },
+      "portal_id": {
+        "in": "path",
+        "name": "id",
+        "schema": {
           "type": "string"
         },
-        "metric": {
-          "type": "object",
-          "properties": {
-            "open": {
-              "type": "number"
-            },
-            "unattended": {
-              "type": "number"
-            }
-          }
-        }
+        "required": true,
+        "description": "The slug identifier of the portal"
       }
-    }
-  },
-  "parameters": {
-    "account_id": {
-      "in": "path",
-      "name": "account_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the account"
     },
-    "agent_bot_id": {
-      "in": "path",
-      "name": "id",
-      "type": "integer",
-      "required": true,
-      "description": "The ID of the agentbot to be updated"
-    },
-    "team_id": {
-      "in": "path",
-      "name": "team_id",
-      "type": "integer",
-      "required": true,
-      "description": "The ID of the team to be updated"
-    },
-    "inbox_id": {
-      "in": "path",
-      "name": "inbox_id",
-      "type": "integer",
-      "required": true,
-      "description": "The ID of the Inbox"
-    },
-    "hook_id": {
-      "in": "path",
-      "name": "hook_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the integration hook"
-    },
-    "source_id": {
-      "in": "path",
-      "name": "source_id",
-      "required": true,
-      "type": "string",
-      "description": "Id of the session for which the conversation is created.\n\n\n\n Source Ids can be obtained through contactable inboxes API or via generated.<br/><br/>Website: Chatwoot generated string which can be obtained from webhook events. <br/> Phone Channels(Twilio): Phone number in e164 format <br/> Email Channels: Contact Email address <br/> API Channel: Any Random String"
-    },
-    "contact_sort_param": {
-      "in": "query",
-      "name": "sort",
-      "type": "string",
-      "enum": [
-        "name",
-        "email",
-        "phone_number",
-        "last_activity_at",
-        "-name",
-        "-email",
-        "-phone_number",
-        "-last_activity_at"
-      ],
-      "required": false,
-      "description": "The attribute by which list should be sorted"
-    },
-    "conversation_id": {
-      "in": "path",
-      "name": "conversation_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the conversation"
-    },
-    "conversation_uuid": {
-      "in": "path",
-      "name": "conversation_uuid",
-      "type": "integer",
-      "required": true,
-      "description": "The uuid of the conversation"
-    },
-    "custom_filter_id": {
-      "in": "path",
-      "name": "custom_filter_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the custom filter"
-    },
-    "webhook_id": {
-      "in": "path",
-      "name": "webhook_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the webhook"
-    },
-    "message_id": {
-      "in": "path",
-      "name": "message_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the message"
-    },
-    "page": {
-      "in": "query",
-      "name": "page",
-      "type": "integer",
-      "default": 1,
-      "required": false,
-      "description": "The page parameter"
-    },
-    "platform_user_id": {
-      "in": "path",
-      "name": "id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the user on the platform"
-    },
-    "report_type": {
-      "in": "query",
-      "name": "type",
-      "type": "string",
-      "enum": [
-        "account",
-        "agent",
-        "inbox",
-        "label",
-        "team"
-      ],
-      "required": true,
-      "description": "Type of report"
-    },
-    "report_metric": {
-      "in": "query",
-      "name": "metric",
-      "type": "string",
-      "enum": [
-        "conversations_count",
-        "incoming_messages_count",
-        "outgoing_messages_count",
-        "avg_first_response_time",
-        "avg_resolution_time",
-        "resolutions_count"
-      ],
-      "required": true,
-      "description": "The type of metric"
-    },
-    "public_inbox_identifier": {
-      "in": "path",
-      "name": "inbox_identifier",
-      "type": "string",
-      "required": true,
-      "description": "The identifier obtained from API inbox channel"
-    },
-    "public_contact_identifier": {
-      "in": "path",
-      "name": "contact_identifier",
-      "type": "string",
-      "required": true,
-      "description": "The source id of contact obtained on contact create"
-    },
-    "portal_id": {
-      "in": "path",
-      "name": "portal_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the portal"
+    "securitySchemes": {
+      "userApiKey": {
+        "type": "apiKey",
+        "in": "header",
+        "name": "api_access_token",
+        "description": "This token can be obtained by visiting the profile page or via rails console. Provides access to  endpoints based on the user permissions levels. This token can be saved by an external system when user is created via API, to perform activities on behalf of the user."
+      },
+      "agentBotApiKey": {
+        "type": "apiKey",
+        "in": "header",
+        "name": "api_access_token",
+        "description": "This token should be provided by system admin or obtained via rails console. This token can be used to build bot integrations and can only access limited apis."
+      },
+      "platformAppApiKey": {
+        "type": "apiKey",
+        "in": "header",
+        "name": "api_access_token",
+        "description": "This token can be obtained by the system admin after creating a platformApp. This token should be used to provision agent bots, accounts, users and their roles."
+      }
     }
   },
   "x-tagGroups": [
@@ -7573,9 +10387,6 @@
         "Agents",
         "Canned Responses",
         "Contacts",
-        "Contact Labels",
-        "Conversation Assignment",
-        "Conversation Labels",
         "Conversations",
         "Custom Attributes",
         "Custom Filters",