diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc7053130..99795db91 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -73,15 +73,15 @@ jobs:
               libvips
 
       - run:
-          name: Install RVM and Ruby 3.3.3
+          name: Install RVM and Ruby 3.4.4
           command: |
             sudo apt-get install -y gpg
             gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
             \curl -sSL https://get.rvm.io | bash -s stable
             echo 'source ~/.rvm/scripts/rvm' >> $BASH_ENV
             source ~/.rvm/scripts/rvm
-            rvm install "3.3.3"
-            rvm use 3.3.3 --default
+            rvm install "3.4.4"
+            rvm use 3.4.4 --default
             gem install bundler -v 2.5.16
 
       - run:
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index c5530ac17..21a9fe909 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       args:
         VARIANT: 'ubuntu-22.04'
         NODE_VERSION: '23.7.0'
-        RUBY_VERSION: '3.3.3'
+        RUBY_VERSION: '3.4.4'
         # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
         USER_UID: '1000'
         USER_GID: '1000'
@@ -25,7 +25,7 @@ services:
       args:
         VARIANT: 'ubuntu-22.04'
         NODE_VERSION: '23.7.0'
-        RUBY_VERSION: '3.3.3'
+        RUBY_VERSION: '3.4.4'
         # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
         USER_UID: '1000'
         USER_GID: '1000'
diff --git a/.rubocop.yml b/.rubocop.yml
index 1cdfbc713..12e756af6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,10 @@
-require:
+plugins:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-factory_bot
+
+require:
   - ./rubocop/use_from_email.rb
   - ./rubocop/custom_cop_location.rb
 
@@ -13,44 +16,61 @@ Metrics/ClassLength:
   Exclude:
     - 'app/models/message.rb'
     - 'app/models/conversation.rb'
+
 Metrics/MethodLength:
   Max: 19
+  Exclude:
+    - 'enterprise/lib/captain/agent.rb'
+
 RSpec/ExampleLength:
   Max: 25
+
 Style/Documentation:
   Enabled: false
+
 Style/ExponentialNotation:
   Enabled: false
+
 Style/FrozenStringLiteralComment:
   Enabled: false
+
 Style/SymbolArray:
   Enabled: false
+
 Style/OpenStructUse:
   Enabled: false
+
 Style/OptionalBooleanParameter:
   Exclude:
     - 'app/services/email_templates/db_resolver_service.rb'
     - 'app/dispatchers/dispatcher.rb'
+
 Style/GlobalVars:
   Exclude:
     - 'config/initializers/01_redis.rb'
     - 'config/initializers/rack_attack.rb'
     - 'lib/redis/alfred.rb'
     - 'lib/global_config.rb'
+
 Style/ClassVars:
   Exclude:
     - 'app/services/email_templates/db_resolver_service.rb'
+
 Lint/MissingSuper:
   Exclude:
     - 'app/drops/base_drop.rb'
+
 Lint/SymbolConversion:
   Enabled: false
+
 Lint/EmptyBlock:
   Exclude:
     - 'app/views/api/v1/accounts/conversations/toggle_status.json.jbuilder'
+
 Lint/OrAssignmentToConstant:
   Exclude:
     - 'lib/redis/config.rb'
+
 Metrics/BlockLength:
   Max: 30
   Exclude:
@@ -58,10 +78,16 @@ Metrics/BlockLength:
     - '**/routes.rb'
     - 'config/environments/*'
     - db/schema.rb
+
 Metrics/ModuleLength:
   Exclude:
     - lib/seeders/message_seeder.rb
     - spec/support/slack_stubs.rb
+
+Rails/HelperInstanceVariable:
+  Exclude:
+    - enterprise/app/helpers/captain/chat_helper.rb
+
 Rails/ApplicationController:
   Exclude:
     - 'app/controllers/api/v1/widget/messages_controller.rb'
@@ -71,74 +97,101 @@ Rails/ApplicationController:
     - 'app/controllers/platform_controller.rb'
     - 'app/controllers/public_controller.rb'
     - 'app/controllers/survey/responses_controller.rb'
+
 Rails/FindEach:
   Enabled: true
   Include:
     - 'app/**/*.rb'
+
 Rails/CompactBlank:
   Enabled: false
+
 Rails/EnvironmentVariableAccess:
   Enabled: false
+
 Rails/TimeZoneAssignment:
   Enabled: false
+
 Rails/RedundantPresenceValidationOnBelongsTo:
   Enabled: false
+
+Rails/InverseOf:
+  Exclude:
+    - enterprise/app/models/captain/assistant.rb
+
+Rails/UniqueValidationWithoutIndex:
+  Exclude:
+    - app/models/canned_response.rb
+    - app/models/telegram_bot.rb
+    - enterprise/app/models/captain_inbox.rb
+    - 'app/models/channel/twitter_profile.rb'
+    - 'app/models/webhook.rb'
+    - 'app/models/contact.rb'
+
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
   Exclude:
     - 'config/application.rb'
     - 'config/initializers/monkey_patches/*'
+
 Style/MapToHash:
   Enabled: false
+
 Style/HashSyntax:
   Enabled: true
   EnforcedStyle: no_mixed_keys
   EnforcedShorthandSyntax: never
+
 RSpec/NestedGroups:
   Enabled: true
   Max: 4
+
 RSpec/MessageSpies:
   Enabled: false
+
 RSpec/StubbedMock:
   Enabled: false
-RSpec/FactoryBot/SyntaxMethods:
-  Enabled: false
+
 Naming/VariableNumber:
   Enabled: false
+
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - 'app/models/message.rb'
+
 Style/GuardClause:
   Exclude:
     - 'app/builders/account_builder.rb'
     - 'app/models/attachment.rb'
     - 'app/models/message.rb'
+
 Metrics/AbcSize:
   Max: 26
   Exclude:
     - 'app/controllers/concerns/auth_helper.rb'
-Rails/UniqueValidationWithoutIndex:
-  Exclude:
-    - 'app/models/channel/twitter_profile.rb'
-    - 'app/models/webhook.rb'
-    - 'app/models/contact.rb'
+
     - 'app/models/integrations/hook.rb'
     - 'app/models/canned_response.rb'
     - 'app/models/telegram_bot.rb'
+
 Rails/RenderInline:
   Exclude:
     - 'app/controllers/swagger_controller.rb'
+
 Rails/ThreeStateBooleanColumn:
   Exclude:
     - 'db/migrate/20230503101201_create_sla_policies.rb'
+
 RSpec/IndexedLet:
   Enabled: false
+
 RSpec/NamedSubject:
   Enabled: false
 
 # we should bring this down
 RSpec/MultipleExpectations:
   Max: 7
+
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
@@ -166,3 +219,121 @@ AllCops:
     - 'tmp/**/*'
     - 'storage/**/*'
     - 'db/migrate/20230426130150_init_schema.rb'
+
+FactoryBot/SyntaxMethods:
+  Enabled: false
+
+# Disable new rules causing errors
+Layout/LeadingCommentSpace:
+  Enabled: false
+
+Style/ReturnNilInPredicateMethodDefinition:
+  Enabled: false
+
+Style/RedundantParentheses:
+  Enabled: false
+
+Performance/StringIdentifierArgument:
+  Enabled: false
+
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Enabled: false
+
+Lint/LiteralAsCondition:
+  Enabled: false
+
+Style/RedundantReturn:
+  Enabled: false
+
+Layout/SpaceAroundOperators:
+  Enabled: false
+
+Rails/EnvLocal:
+  Enabled: false
+
+Rails/WhereRange:
+  Enabled: false
+
+Lint/UselessConstantScoping:
+  Enabled: false
+
+Style/MultipleComparison:
+  Enabled: false
+
+Bundler/OrderedGems:
+  Enabled: false
+
+RSpec/ExampleWording:
+  Enabled: false
+
+RSpec/ReceiveMessages:
+  Enabled: false
+
+FactoryBot/AssociationStyle:
+  Enabled: false
+
+Rails/EnumSyntax:
+  Enabled: false
+
+Lint/RedundantTypeConversion:
+  Enabled: false
+
+# Additional rules to disable
+Rails/RedundantActiveRecordAllMethod:
+  Enabled: false
+
+Layout/TrailingEmptyLines:
+  Enabled: false
+
+Style/SafeNavigationChainLength:
+  Enabled: false
+
+Lint/SafeNavigationConsistency:
+  Enabled: false
+
+Lint/CopDirectiveSyntax:
+  Enabled: false
+
+# Final set of rules to disable
+FactoryBot/ExcessiveCreateList:
+  Enabled: false
+
+RSpec/MissingExpectationTargetMethod:
+  Enabled: false
+
+Performance/InefficientHashSearch:
+  Enabled: false
+
+Style/RedundantSelfAssignmentBranch:
+  Enabled: false
+
+Style/YAMLFileRead:
+  Enabled: false
+
+Layout/ExtraSpacing:
+  Enabled: false
+
+Style/RedundantFilterChain:
+  Enabled: false
+
+Performance/MapMethodChain:
+  Enabled: false
+
+Rails/RootPathnameMethods:
+  Enabled: false
+
+Style/SuperArguments:
+  Enabled: false
+
+# Final remaining rules to disable
+Rails/Delegate:
+  Enabled: false
+
+Style/CaseLikeIf:
+  Enabled: false
+
+FactoryBot/RedundantFactoryOption:
+  Enabled: false
+
+FactoryBot/FactoryAssociationWithStrategy:
+  Enabled: false
\ No newline at end of file
diff --git a/.ruby-version b/.ruby-version
index 619b53766..f9892605c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.3
+3.4.4
diff --git a/Gemfile b/Gemfile
index 53c15b116..dc3bb702b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
-ruby '3.2.3'
+ruby '3.4.4'
 
 ##-- base gems for rails --##
 gem 'rack-cors', '2.0.0', require: 'rack/cors'
-gem 'rails', '~> 7.0.8.4'
+gem 'rails', '~> 7.1'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
@@ -237,9 +237,10 @@ group :development, :test do
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
   gem 'rubocop-rspec', require: false
+  gem 'rubocop-factory_bot', require: false
   gem 'seed_dump'
   gem 'shoulda-matchers'
   gem 'simplecov', '0.17.1', require: false
   gem 'spring'
   gem 'spring-watcher-listen'
-end
+end
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 0008e13c5..626b8251c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,76 +25,89 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activejob (= 7.0.8.7)
-      activerecord (= 7.0.8.7)
-      activestorage (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      actionview (= 7.0.8.7)
-      activejob (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.7)
-      actionview (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      rack (~> 2.0, >= 2.2.4)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activerecord (= 7.0.8.7)
-      activestorage (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8.7)
-      activesupport (= 7.0.8.7)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
     active_record_query_trace (1.8)
-    activejob (7.0.8.7)
-      activesupport (= 7.0.8.7)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.8.7)
-      activesupport (= 7.0.8.7)
-    activerecord (7.0.8.7)
-      activemodel (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-    activerecord-import (1.4.1)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      timeout (>= 0.4.0)
+    activerecord-import (2.1.0)
       activerecord (>= 4.2)
-    activestorage (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activejob (= 7.0.8.7)
-      activerecord (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.8.7)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    acts-as-taggable-on (9.0.1)
-      activerecord (>= 6.0, < 7.1)
+    acts-as-taggable-on (12.0.0)
+      activerecord (>= 7.1, < 8.1)
+      zeitwerk (>= 2.4, < 3.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     administrate (0.20.1)
@@ -116,7 +129,7 @@ GEM
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
-    ast (2.4.2)
+    ast (2.4.3)
     attr_extras (7.1.0)
     audited (5.4.1)
       activerecord (>= 5.0, < 7.7)
@@ -142,14 +155,15 @@ GEM
       statsd-ruby (~> 1.1)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
     brakeman (5.4.1)
     browser (5.3.1)
     builder (3.3.0)
-    bullet (7.0.7)
+    bullet (8.0.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundle-audit (0.1.0)
@@ -161,8 +175,8 @@ GEM
     climate_control (1.2.0)
     coderay (1.1.3)
     commonmarker (0.23.10)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -176,16 +190,10 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datadog-ci (0.8.3)
-      msgpack
     date (3.4.1)
-    ddtrace (1.23.2)
-      datadog-ci (~> 0.8.1)
-      debase-ruby_core_source (= 3.3.1)
-      libdatadog (~> 7.0.0.1.0)
-      libddwaf (~> 1.14.0.0.0)
+    ddtrace (0.48.0)
+      ffi (~> 1.0)
       msgpack
-    debase-ruby_core_source (3.3.1)
     debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
@@ -196,10 +204,10 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_token_auth (1.2.3)
+    devise_token_auth (1.2.5)
       bcrypt (~> 3.0)
       devise (> 3.5.2, < 5)
-      rails (>= 4.2.0, < 7.2)
+      rails (>= 4.2.0, < 8.1)
     diff-lcs (1.5.1)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
@@ -212,6 +220,7 @@ GEM
       railties (>= 6.1)
     down (5.4.0)
       addressable (~> 2.8)
+    drb (2.2.3)
     dry-cli (1.1.0)
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
@@ -254,7 +263,10 @@ GEM
     fcm (1.0.8)
       faraday (>= 1.0.0, < 3.0)
       googleauth (~> 1)
-    ffi (1.16.3)
+    ffi (1.17.2)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -315,16 +327,13 @@ GEM
     google-cloud-translate-v3 (0.10.0)
       gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.25.5)
-    google-protobuf (3.25.5-arm64-darwin)
-    google-protobuf (3.25.5-x86_64-darwin)
-    google-protobuf (3.25.5-x86_64-linux)
+    google-protobuf (3.25.7)
     googleapis-common-protos (1.6.0)
       google-protobuf (>= 3.18, < 5.a)
       googleapis-common-protos-types (~> 1.7)
       grpc (~> 1.41)
-    googleapis-common-protos-types (1.14.0)
-      google-protobuf (~> 3.18)
+    googleapis-common-protos-types (1.20.0)
+      google-protobuf (>= 3.18, < 5.a)
     googleauth (1.11.2)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.1)
@@ -334,17 +343,17 @@ GEM
       signet (>= 0.16, < 2.a)
     groupdate (6.2.1)
       activesupport (>= 5.2)
-    grpc (1.62.0)
-      google-protobuf (~> 3.25)
+    grpc (1.72.0)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.62.0-arm64-darwin)
-      google-protobuf (~> 3.25)
+    grpc (1.72.0-arm64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.62.0-x86_64-darwin)
-      google-protobuf (~> 3.25)
+    grpc (1.72.0-x86_64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.62.0-x86_64-linux)
-      google-protobuf (~> 3.25)
+    grpc (1.72.0-x86_64-linux)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     haikunator (1.1.1)
     hairtrigger (1.0.0)
@@ -370,7 +379,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
@@ -388,7 +397,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.6.3)
+    json (2.12.0)
     json_refs (0.1.8)
       hana
     json_schemer (0.2.24)
@@ -423,21 +432,13 @@ GEM
       faraday-multipart
       json (>= 1.8)
       rexml
+    language_server-protocol (3.17.0.5)
     launchy (2.5.2)
       addressable (~> 2.8)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
-    libdatadog (7.0.0.1.0)
-    libdatadog (7.0.0.1.0-x86_64-linux)
-    libddwaf (1.14.0.0.0)
-      ffi (~> 1.0)
-    libddwaf (1.14.0.0.0-arm64-darwin)
-      ffi (~> 1.0)
-    libddwaf (1.14.0.0.0-x86_64-darwin)
-      ffi (~> 1.0)
-    libddwaf (1.14.0.0.0-x86_64-linux)
-      ffi (~> 1.0)
     line-bot-api (1.28.0)
+    lint_roller (1.1.0)
     liquid (5.4.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -445,7 +446,7 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    logger (1.6.0)
+    logger (1.7.0)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -471,10 +472,10 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
-    minitest (5.25.4)
+    minitest (5.25.5)
     mock_redis (0.36.0)
       ruby2_keywords
-    msgpack (1.7.0)
+    msgpack (1.8.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
@@ -545,14 +546,16 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.4)
     ostruct (0.6.1)
-    parallel (1.23.0)
-    parser (3.2.2.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
+      racc
     pg (1.5.3)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
     pgvector (0.1.1)
+    prism (1.4.0)
     procore-sift (1.0.0)
       activerecord (>= 6.1)
     pry (0.14.2)
@@ -567,7 +570,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.14)
+    rack (2.2.15)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.5.0)
@@ -581,23 +584,28 @@ GEM
       rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.7)
       rack
+    rack-session (1.0.2)
+      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.8.7)
-      actioncable (= 7.0.8.7)
-      actionmailbox (= 7.0.8.7)
-      actionmailer (= 7.0.8.7)
-      actionpack (= 7.0.8.7)
-      actiontext (= 7.0.8.7)
-      actionview (= 7.0.8.7)
-      activejob (= 7.0.8.7)
-      activemodel (= 7.0.8.7)
-      activerecord (= 7.0.8.7)
-      activestorage (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
+    rackup (1.0.1)
+      rack (< 3)
+      webrick
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.8.7)
+      railties (= 7.1.5.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -605,13 +613,14 @@ GEM
     rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      method_source
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
@@ -623,7 +632,7 @@ GEM
       connection_pool
     redis-namespace (1.10.0)
       redis (>= 4)
-    regexp_parser (2.8.0)
+    regexp_parser (2.10.0)
     reline (0.3.6)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -643,7 +652,7 @@ GEM
     retriable (3.1.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.3.9)
+    rexml (3.4.1)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.2)
@@ -663,30 +672,36 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.50.2)
+    rubocop (1.75.6)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
-      rubocop (~> 1.41)
-    rubocop-performance (1.17.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.19.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.21.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-openai (7.3.1)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
@@ -816,8 +831,10 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
-    uniform_notifier (1.16.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uniform_notifier (1.17.0)
     uri (1.0.3)
     uri_template (0.7.0)
     valid_email2 (5.2.6)
@@ -845,7 +862,9 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.6)
+    webrick (1.9.1)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.0)
@@ -951,7 +970,7 @@ DEPENDENCIES
   rack-cors (= 2.0.0)
   rack-mini-profiler (>= 3.2.0)
   rack-timeout
-  rails (~> 7.0.8.4)
+  rails (~> 7.1)
   redis
   redis-namespace
   responders (>= 3.1.1)
@@ -960,6 +979,7 @@ DEPENDENCIES
   rspec-rails (>= 6.1.5)
   rspec_junit_formatter
   rubocop
+  rubocop-factory_bot
   rubocop-performance
   rubocop-rails
   rubocop-rspec
@@ -997,7 +1017,7 @@ DEPENDENCIES
   working_hours
 
 RUBY VERSION
-   ruby 3.2.3p157
+   ruby 3.4.4p34
 
 BUNDLED WITH
-   2.5.16
+   2.5.16
\ No newline at end of file
diff --git a/app/builders/account_builder.rb b/app/builders/account_builder.rb
index 6f7980586..532487a1b 100644
--- a/app/builders/account_builder.rb
+++ b/app/builders/account_builder.rb
@@ -32,14 +32,7 @@ class AccountBuilder
   end
 
   def validate_email
-    raise InvalidEmail.new({ domain_blocked: domain_blocked }) if domain_blocked?
-
-    address = ValidEmail2::Address.new(@email)
-    if address.valid? && !address.disposable?
-      true
-    else
-      raise InvalidEmail.new({ valid: address.valid?, disposable: address.disposable? })
-    end
+    Account::SignUpEmailValidationService.new(@email).perform
   end
 
   def validate_user
@@ -81,21 +74,4 @@ class AccountBuilder
     @user.confirm if @confirmed
     @user.save!
   end
-
-  def domain_blocked?
-    domain = @email.split('@').last
-
-    blocked_domains.each do |blocked_domain|
-      return true if domain.match?(blocked_domain)
-    end
-
-    false
-  end
-
-  def blocked_domains
-    domains = GlobalConfigService.load('BLOCKED_EMAIL_DOMAINS', '')
-    return [] if domains.blank?
-
-    domains.split("\n").map(&:strip)
-  end
 end
diff --git a/app/builders/contact_inbox_builder.rb b/app/builders/contact_inbox_builder.rb
index ffa45db2e..788ae39d1 100644
--- a/app/builders/contact_inbox_builder.rb
+++ b/app/builders/contact_inbox_builder.rb
@@ -59,11 +59,13 @@ class ContactInboxBuilder
   end
 
   def create_contact_inbox
-    ::ContactInbox.create_with(hmac_verified: hmac_verified || false).find_or_create_by!(
+    attrs = {
       contact_id: @contact.id,
       inbox_id: @inbox.id,
       source_id: @source_id
-    )
+    }
+
+    ::ContactInbox.where(attrs).first_or_create!(hmac_verified: hmac_verified || false)
   rescue ActiveRecord::RecordNotUnique
     Rails.logger.info("[ContactInboxBuilder] RecordNotUnique #{@source_id} #{@contact.id} #{@inbox.id}")
     update_old_contact_inbox
diff --git a/app/builders/messages/instagram/base_message_builder.rb b/app/builders/messages/instagram/base_message_builder.rb
index 767115bc6..8b40ba3c9 100644
--- a/app/builders/messages/instagram/base_message_builder.rb
+++ b/app/builders/messages/instagram/base_message_builder.rb
@@ -152,11 +152,13 @@ class Messages::Instagram::BaseMessageBuilder < Messages::Messenger::MessageBuil
   end
 
   def message_already_exists?
-    cw_message = conversation.messages.where(
-      source_id: @messaging[:message][:mid]
-    ).first
+    find_message_by_source_id(@messaging[:message][:mid]).present?
+  end
 
-    cw_message.present?
+  def find_message_by_source_id(source_id)
+    return unless source_id
+
+    @message = Message.find_by(source_id: source_id)
   end
 
   def all_unsupported_files?
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/contacts/conversations_controller.rb b/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
index fda19b8c2..20d66fb4d 100644
--- a/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
@@ -12,10 +12,6 @@ class Api::V1::Accounts::Contacts::ConversationsController < Api::V1::Accounts::
       Current.account
     ).perform
 
-    # Only allow conversations from inboxes the user has access to
-    inbox_ids = Current.user.assigned_inboxes.pluck(:id)
-    conversations = conversations.where(inbox_id: inbox_ids)
-
     @conversations = conversations.order(last_activity_at: :desc).limit(20)
   end
 end
diff --git a/app/controllers/api/v1/accounts/integrations/linear_controller.rb b/app/controllers/api/v1/accounts/integrations/linear_controller.rb
index 4e5348e88..c66f06909 100644
--- a/app/controllers/api/v1/accounts/integrations/linear_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/linear_controller.rb
@@ -94,7 +94,8 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
   end
 
   def permitted_params
-    params.permit(:team_id, :project_id, :conversation_id, :issue_id, :link_id, :title, :description, :assignee_id, :priority, label_ids: [])
+    params.permit(:team_id, :project_id, :conversation_id, :issue_id, :link_id, :title, :description, :assignee_id, :priority, :state_id,
+                  label_ids: [])
   end
 
   def fetch_hook
diff --git a/app/controllers/devise_overrides/omniauth_callbacks_controller.rb b/app/controllers/devise_overrides/omniauth_callbacks_controller.rb
index 2b3ea9067..db312e94f 100644
--- a/app/controllers/devise_overrides/omniauth_callbacks_controller.rb
+++ b/app/controllers/devise_overrides/omniauth_callbacks_controller.rb
@@ -21,7 +21,7 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
 
   def sign_up_user
     return redirect_to login_page_url(error: 'no-account-found') unless account_signup_allowed?
-    return redirect_to login_page_url(error: 'business-account-only') unless validate_business_account?
+    return redirect_to login_page_url(error: 'business-account-only') unless validate_signup_email_is_business_domain?
 
     create_account_for_user
     token = @resource.send(:set_reset_password_token)
@@ -53,9 +53,11 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
     ).first
   end
 
-  def validate_business_account?
-    # return true if the user is a business account, false if it is a gmail account
-    auth_hash['info']['email'].downcase.exclude?('@gmail.com')
+  def validate_signup_email_is_business_domain?
+    # return true if the user is a business account, false if it is a blocked domain account
+    Account::SignUpEmailValidationService.new(auth_hash['info']['email']).perform
+  rescue CustomExceptions::Account::InvalidEmail
+    false
   end
 
   def create_account_for_user
diff --git a/app/controllers/platform/api/v1/users_controller.rb b/app/controllers/platform/api/v1/users_controller.rb
index 453e475b0..7b9284cd9 100644
--- a/app/controllers/platform/api/v1/users_controller.rb
+++ b/app/controllers/platform/api/v1/users_controller.rb
@@ -1,9 +1,9 @@
 class Platform::Api::V1::UsersController < PlatformController
   # ref: https://stackoverflow.com/a/45190318/939299
   # set resource is called for other actions already in platform controller
-  # we want to add login to that chain as well
-  before_action(only: [:login]) { set_resource }
-  before_action(only: [:login]) { validate_platform_app_permissible }
+  # we want to add login and token to that chain as well
+  before_action(only: [:login, :token]) { set_resource }
+  before_action(only: [:login, :token]) { validate_platform_app_permissible }
 
   def show; end
 
@@ -18,6 +18,8 @@ class Platform::Api::V1::UsersController < PlatformController
     render json: { url: @resource.generate_sso_link }
   end
 
+  def token; end
+
   def update
     @resource.assign_attributes(user_update_params)
 
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 1694199ba..d43ed31e7 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -88,7 +88,10 @@ class ConversationFinder
 
   def find_conversation_by_inbox
     @conversations = current_account.conversations
-    @conversations = @conversations.where(inbox_id: @inbox_ids) unless params[:inbox_id].blank? && @is_admin
+
+    return unless params[:inbox_id]
+
+    @conversations = @conversations.where(inbox_id: @inbox_ids)
   end
 
   def find_all_conversations
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue
new file mode 100644
index 000000000..47b779b61
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue
@@ -0,0 +1,65 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useToggle } from '@vueuse/core';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import ConfirmContactDeleteDialog from 'dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue';
+
+defineProps({
+  selectedContact: {
+    type: Object,
+    required: true,
+  },
+});
+
+const { t } = useI18n();
+
+const [showDeleteSection, toggleDeleteSection] = useToggle();
+const confirmDeleteContactDialogRef = ref(null);
+
+const openConfirmDeleteContactDialog = () => {
+  confirmDeleteContactDialogRef.value?.dialogRef.open();
+};
+</script>
+
+<template>
+  <div class="flex flex-col items-start border-t border-n-strong px-6 py-5">
+    <Button
+      :label="t('CONTACTS_LAYOUT.DETAILS.DELETE_CONTACT')"
+      sm
+      link
+      slate
+      class="hover:!no-underline text-n-slate-12"
+      icon="i-lucide-chevron-down"
+      trailing-icon
+      @click="toggleDeleteSection()"
+    />
+
+    <div
+      class="transition-all duration-300 ease-in-out grid w-full overflow-hidden"
+      :class="
+        showDeleteSection
+          ? 'grid-rows-[1fr] opacity-100 mt-2'
+          : 'grid-rows-[0fr] opacity-0 mt-0'
+      "
+    >
+      <div class="overflow-hidden min-h-0">
+        <span class="inline-flex text-n-slate-11 text-sm items-center gap-1">
+          {{ t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.MESSAGE') }}
+          <Button
+            :label="t('CONTACTS_LAYOUT.CARD.DELETE_CONTACT.BUTTON')"
+            sm
+            ruby
+            link
+            @click="openConfirmDeleteContactDialog()"
+          />
+        </span>
+      </div>
+    </div>
+  </div>
+  <ConfirmContactDeleteDialog
+    ref="confirmDeleteContactDialogRef"
+    :selected-contact="selectedContact"
+  />
+</template>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index a3b0bf37c..b2b0dbfa0 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -7,6 +7,7 @@ import ContactsForm from 'dashboard/components-next/Contacts/ContactsForm/Contac
 import Button from 'dashboard/components-next/button/Button.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
 import Flag from 'dashboard/components-next/flag/Flag.vue';
+import ContactDeleteSection from 'dashboard/components-next/Contacts/ContactsCard/ContactDeleteSection.vue';
 import countries from 'shared/constants/countries';
 
 const props = defineProps({
@@ -149,15 +150,15 @@ const onClickViewDetails = () => emit('showContact', props.id);
     />
 
     <template #after>
-      <transition
-        enter-active-class="overflow-hidden transition-all duration-300 ease-out"
-        leave-active-class="overflow-hidden transition-all duration-300 ease-in"
-        enter-from-class="overflow-hidden opacity-0 max-h-0"
-        enter-to-class="opacity-100 max-h-[690px] sm:max-h-[470px] md:max-h-[410px]"
-        leave-from-class="opacity-100 max-h-[690px] sm:max-h-[470px] md:max-h-[410px]"
-        leave-to-class="overflow-hidden opacity-0 max-h-0"
+      <div
+        class="transition-all duration-500 ease-in-out grid overflow-hidden"
+        :class="
+          isExpanded
+            ? 'grid-rows-[1fr] opacity-100'
+            : 'grid-rows-[0fr] opacity-0'
+        "
       >
-        <div v-show="isExpanded" class="w-full">
+        <div class="overflow-hidden">
           <div class="flex flex-col gap-6 p-6 border-t border-n-strong">
             <ContactsForm
               ref="contactsFormRef"
@@ -176,8 +177,14 @@ const onClickViewDetails = () => emit('showContact', props.id);
               />
             </div>
           </div>
+          <ContactDeleteSection
+            :selected-contact="{
+              id: props.id,
+              name: props.name,
+            }"
+          />
         </div>
-      </transition>
+      </div>
     </template>
   </CardLayout>
 </template>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue b/app/javascript/dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue
index d9c0deb1b..f43a50883 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsForm/ConfirmContactDeleteDialog.vue
@@ -47,11 +47,7 @@ defineExpose({ dialogRef });
     ref="dialogRef"
     type="alert"
     :title="t('CONTACTS_LAYOUT.DETAILS.DELETE_DIALOG.TITLE')"
-    :description="
-      t('CONTACTS_LAYOUT.DETAILS.DELETE_DIALOG.DESCRIPTION', {
-        contactName: props.selectedContact.name,
-      })
-    "
+    :description="t('CONTACTS_LAYOUT.DETAILS.DELETE_DIALOG.DESCRIPTION')"
     :confirm-button-label="t('CONTACTS_LAYOUT.DETAILS.DELETE_DIALOG.CONFIRM')"
     @confirm="handleDialogConfirm"
   />
diff --git a/app/javascript/dashboard/components-next/button/Button.vue b/app/javascript/dashboard/components-next/button/Button.vue
index c54bd395a..dde1d3d9a 100644
--- a/app/javascript/dashboard/components-next/button/Button.vue
+++ b/app/javascript/dashboard/components-next/button/Button.vue
@@ -117,7 +117,7 @@ const STYLE_CONFIG = {
         'text-n-ruby-11 hover:enabled:bg-n-ruby-9/10 focus-visible:bg-n-ruby-9/10 outline-n-ruby-8',
       ghost:
         'text-n-ruby-11 hover:enabled:bg-n-alpha-2 focus-visible:bg-n-alpha-2 outline-transparent',
-      link: 'text-n-ruby-9 hover:enabled:underline focus-visible:underline outline-transparent',
+      link: 'text-n-ruby-9 dark:text-n-ruby-11 hover:enabled:underline focus-visible:underline outline-transparent',
     },
     amber: {
       solid:
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotAgentMessage.vue b/app/javascript/dashboard/components-next/copilot/CopilotAgentMessage.vue
index ef8c2faf4..f1ad2afc1 100644
--- a/app/javascript/dashboard/components-next/copilot/CopilotAgentMessage.vue
+++ b/app/javascript/dashboard/components-next/copilot/CopilotAgentMessage.vue
@@ -1,31 +1,17 @@
 <script setup>
-import Avatar from '../avatar/Avatar.vue';
-
 defineProps({
   message: {
     type: Object,
     required: true,
   },
-  supportAgent: {
-    type: Object,
-    required: true,
-  },
 });
 </script>
 
 <template>
-  <div class="flex flex-row gap-2">
-    <Avatar
-      :name="supportAgent.available_name"
-      :src="supportAgent.avatar_url"
-      :size="24"
-      rounded-full
-    />
-    <div class="space-y-1 text-n-slate-12">
-      <div class="font-medium">{{ $t('CAPTAIN.COPILOT.YOU') }}</div>
-      <div class="break-words">
-        {{ message.content }}
-      </div>
+  <div class="space-y-1 text-n-slate-12">
+    <div class="font-medium">{{ $t('CAPTAIN.COPILOT.YOU') }}</div>
+    <div class="break-words">
+      {{ message.content }}
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotAssistantMessage.vue b/app/javascript/dashboard/components-next/copilot/CopilotAssistantMessage.vue
index 1877e1630..0a37600bf 100644
--- a/app/javascript/dashboard/components-next/copilot/CopilotAssistantMessage.vue
+++ b/app/javascript/dashboard/components-next/copilot/CopilotAssistantMessage.vue
@@ -9,7 +9,6 @@ import { COPILOT_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 import MessageFormatter from 'shared/helpers/MessageFormatter.js';
 
 import Button from 'dashboard/components-next/button/Button.vue';
-import Avatar from '../avatar/Avatar.vue';
 
 const props = defineProps({
   message: {
@@ -46,33 +45,25 @@ const useCopilotResponse = () => {
 </script>
 
 <template>
-  <div class="flex flex-row gap-2">
-    <Avatar
-      name="Captain Copilot"
-      icon-name="i-woot-captain"
-      :size="24"
-      rounded-full
+  <div class="flex flex-col gap-1 text-n-slate-12">
+    <div class="font-medium">{{ $t('CAPTAIN.NAME') }}</div>
+    <span v-if="hasEmptyMessageContent" class="text-n-ruby-11">
+      {{ $t('CAPTAIN.COPILOT.EMPTY_MESSAGE') }}
+    </span>
+    <div
+      v-else
+      v-dompurify-html="messageContent"
+      class="prose-sm break-words"
     />
-    <div class="flex flex-col gap-1 text-n-slate-12">
-      <div class="font-medium">{{ $t('CAPTAIN.NAME') }}</div>
-      <span v-if="hasEmptyMessageContent" class="text-n-ruby-11">
-        {{ $t('CAPTAIN.COPILOT.EMPTY_MESSAGE') }}
-      </span>
-      <div
-        v-else
-        v-dompurify-html="messageContent"
-        class="prose-sm break-words"
+    <div class="flex flex-row mt-1">
+      <Button
+        v-if="!hasEmptyMessageContent"
+        :label="$t('CAPTAIN.COPILOT.USE')"
+        faded
+        sm
+        slate
+        @click="useCopilotResponse"
       />
-      <div class="flex flex-row mt-1">
-        <Button
-          v-if="!hasEmptyMessageContent"
-          :label="$t('CAPTAIN.COPILOT.USE')"
-          faded
-          sm
-          slate
-          @click="useCopilotResponse"
-        />
-      </div>
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotHeader.story.vue b/app/javascript/dashboard/components-next/copilot/CopilotHeader.story.vue
new file mode 100644
index 000000000..78a345093
--- /dev/null
+++ b/app/javascript/dashboard/components-next/copilot/CopilotHeader.story.vue
@@ -0,0 +1,21 @@
+<script setup>
+import CopilotHeader from './CopilotHeader.vue';
+</script>
+
+<template>
+  <Story
+    title="Captain/Copilot/CopilotHeader"
+    :layout="{ type: 'grid', width: '800px' }"
+  >
+    <!-- Default State -->
+    <Variant title="Default State">
+      <CopilotHeader />
+    </Variant>
+
+    <!-- With New Conversation Button -->
+    <Variant title="With New Conversation Button">
+      <!-- eslint-disable-next-line vue/prefer-true-attribute-shorthand -->
+      <CopilotHeader :has-messages="true" />
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotHeader.vue b/app/javascript/dashboard/components-next/copilot/CopilotHeader.vue
new file mode 100644
index 000000000..c7a8696f3
--- /dev/null
+++ b/app/javascript/dashboard/components-next/copilot/CopilotHeader.vue
@@ -0,0 +1,32 @@
+<script setup>
+import Button from '../button/Button.vue';
+defineProps({
+  hasMessages: {
+    type: Boolean,
+    default: false,
+  },
+});
+defineEmits(['reset', 'close']);
+</script>
+
+<template>
+  <div
+    class="flex items-center justify-between px-5 py-2 border-b border-n-weak h-12"
+  >
+    <div class="flex items-center justify-between gap-2 flex-1">
+      <span class="font-medium text-sm text-n-slate-12">
+        {{ $t('CAPTAIN.COPILOT.TITLE') }}
+      </span>
+      <div class="flex items-center">
+        <Button
+          v-if="hasMessages"
+          icon="i-lucide-plus"
+          ghost
+          sm
+          @click="$emit('reset')"
+        />
+        <Button icon="i-lucide-x" ghost sm @click="$emit('close')" />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotInput.vue b/app/javascript/dashboard/components-next/copilot/CopilotInput.vue
index bf14945b5..c8f1a0056 100644
--- a/app/javascript/dashboard/components-next/copilot/CopilotInput.vue
+++ b/app/javascript/dashboard/components-next/copilot/CopilotInput.vue
@@ -13,19 +13,16 @@ const sendMessage = () => {
 </script>
 
 <template>
-  <form
-    class="border border-n-weak bg-n-alpha-3 rounded-lg h-12 flex"
-    @submit.prevent="sendMessage"
-  >
+  <form class="relative" @submit.prevent="sendMessage">
     <input
       v-model="message"
       type="text"
       :placeholder="$t('CAPTAIN.COPILOT.SEND_MESSAGE')"
-      class="w-full reset-base bg-transparent px-4 py-3 text-n-slate-11 text-sm"
+      class="w-full reset-base bg-n-alpha-3 ltr:pl-4 ltr:pr-12 rtl:pl-12 rtl:pr-4 py-3 text-n-slate-11 text-sm border border-n-weak rounded-lg focus:outline-none focus:ring-1 focus:ring-n-blue-11 focus:border-n-blue-11"
       @keyup.enter="sendMessage"
     />
     <button
-      class="h-auto w-12 flex items-center justify-center text-n-slate-11"
+      class="absolute ltr:right-1 rtl:left-1 top-1/2 -translate-y-1/2 h-9 w-10 flex items-center justify-center text-n-slate-11 hover:text-n-blue-11"
       type="submit"
     >
       <i class="i-ph-arrow-up" />
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotThinkingBlock.vue b/app/javascript/dashboard/components-next/copilot/CopilotThinkingBlock.vue
new file mode 100644
index 000000000..59e627f8d
--- /dev/null
+++ b/app/javascript/dashboard/components-next/copilot/CopilotThinkingBlock.vue
@@ -0,0 +1,25 @@
+<script setup>
+import Icon from '../../components-next/icon/Icon.vue';
+defineProps({
+  content: {
+    type: String,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div
+    class="flex flex-col gap-2 p-3 rounded-lg bg-n-background/50 border border-n-weak hover:bg-n-background/80 transition-colors duration-200"
+  >
+    <div class="flex items-start gap-2">
+      <Icon
+        icon="i-lucide-sparkles"
+        class="w-4 h-4 mt-0.5 flex-shrink-0 text-n-slate-9"
+      />
+      <div class="text-sm text-n-slate-11">
+        {{ content }}
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotThinkingGroup.story.vue b/app/javascript/dashboard/components-next/copilot/CopilotThinkingGroup.story.vue
new file mode 100644
index 000000000..098316dbc
--- /dev/null
+++ b/app/javascript/dashboard/components-next/copilot/CopilotThinkingGroup.story.vue
@@ -0,0 +1,34 @@
+<script setup>
+import CopilotThinkingGroup from './CopilotThinkingGroup.vue';
+
+const messages = [
+  {
+    id: 1,
+    content: 'Analyzing the user query',
+    reasoning: 'Breaking down the request into actionable steps',
+  },
+  {
+    id: 2,
+    content: 'Searching codebase',
+    reasoning: 'Looking for relevant files and functions',
+  },
+  {
+    id: 3,
+    content: 'Generating response',
+    reasoning: 'Composing a helpful and accurate answer',
+  },
+];
+</script>
+
+<template>
+  <Story title="Captain/Copilot/CopilotThinkingGroup" group="components">
+    <Variant title="Default">
+      <CopilotThinkingGroup :messages="messages" />
+    </Variant>
+
+    <Variant title="With Default Collapsed">
+      <!-- eslint-disable-next-line -->
+      <CopilotThinkingGroup :messages="messages" :default-collapsed="true" />
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/copilot/CopilotThinkingGroup.vue b/app/javascript/dashboard/components-next/copilot/CopilotThinkingGroup.vue
new file mode 100644
index 000000000..c34b5b35a
--- /dev/null
+++ b/app/javascript/dashboard/components-next/copilot/CopilotThinkingGroup.vue
@@ -0,0 +1,61 @@
+<script setup>
+import { ref, watch, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import Icon from '../icon/Icon.vue';
+import CopilotThinkingBlock from './CopilotThinkingBlock.vue';
+
+const props = defineProps({
+  messages: { type: Array, required: true },
+  defaultCollapsed: { type: Boolean, default: false },
+});
+const { t } = useI18n();
+const isExpanded = ref(!props.defaultCollapsed);
+
+const thinkingCount = computed(() => props.messages.length);
+
+watch(
+  () => props.defaultCollapsed,
+  newValue => {
+    if (newValue) {
+      isExpanded.value = false;
+    }
+  }
+);
+</script>
+
+<template>
+  <div class="flex flex-col gap-2">
+    <button
+      class="group flex items-center gap-2 text-xs text-n-slate-10 hover:text-n-slate-11 transition-colors duration-200 -ml-3"
+      @click="isExpanded = !isExpanded"
+    >
+      <Icon
+        :icon="isExpanded ? 'i-lucide-chevron-down' : 'i-lucide-chevron-right'"
+        class="w-4 h-4 transition-transform duration-200 group-hover:scale-110"
+      />
+      <span class="flex items-center gap-2">
+        {{ t('CAPTAIN.COPILOT.SHOW_STEPS') }}
+        <span
+          class="inline-flex items-center justify-center h-4 min-w-4 px-1 text-xs font-medium rounded-full bg-n-solid-3 text-n-slate-11"
+        >
+          {{ thinkingCount }}
+        </span>
+      </span>
+    </button>
+    <div
+      v-show="isExpanded"
+      class="space-y-3 transition-all duration-200"
+      :class="{
+        'opacity-100': isExpanded,
+        'opacity-0 max-h-0 overflow-hidden': !isExpanded,
+      }"
+    >
+      <CopilotThinkingBlock
+        v-for="message in messages"
+        :key="message.id"
+        :content="message.content"
+        :reasoning="message.reasoning"
+      />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarProfileMenuStatus.vue b/app/javascript/dashboard/components-next/sidebar/SidebarProfileMenuStatus.vue
index 0fdf96162..fef196162 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarProfileMenuStatus.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarProfileMenuStatus.vue
@@ -4,6 +4,7 @@ import { useMapGetter, useStore } from 'dashboard/composables/store';
 import wootConstants from 'dashboard/constants/globals';
 import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
+import { useImpersonation } from 'dashboard/composables/useImpersonation';
 
 import {
   DropdownContainer,
@@ -20,6 +21,8 @@ const currentUserAvailability = useMapGetter('getCurrentUserAvailability');
 const currentAccountId = useMapGetter('getCurrentAccountId');
 const currentUserAutoOffline = useMapGetter('getCurrentUserAutoOffline');
 
+const { isImpersonating } = useImpersonation();
+
 const { AVAILABILITY_STATUS_KEYS } = wootConstants;
 const statusList = computed(() => {
   return [
@@ -46,6 +49,10 @@ const activeStatus = computed(() => {
 });
 
 function changeAvailabilityStatus(availability) {
+  if (isImpersonating.value) {
+    useAlert(t('PROFILE_SETTINGS.FORM.AVAILABILITY.IMPERSONATING_ERROR'));
+    return;
+  }
   try {
     store.dispatch('updateAvailability', {
       availability,
diff --git a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
index 04190c7a4..a4995aee8 100644
--- a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
+++ b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
@@ -1,6 +1,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { useAlert } from 'dashboard/composables';
+import { useImpersonation } from 'dashboard/composables/useImpersonation';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
 import WootDropdownHeader from 'shared/components/ui/dropdown/DropdownHeader.vue';
@@ -20,6 +21,10 @@ export default {
     AvailabilityStatusBadge,
     NextButton,
   },
+  setup() {
+    const { isImpersonating } = useImpersonation();
+    return { isImpersonating };
+  },
   data() {
     return {
       isStatusMenuOpened: false,
@@ -73,6 +78,13 @@ export default {
       });
     },
     changeAvailabilityStatus(availability) {
+      if (this.isImpersonating) {
+        useAlert(
+          this.$t('PROFILE_SETTINGS.FORM.AVAILABILITY.IMPERSONATING_ERROR')
+        );
+        return;
+      }
+
       if (this.isUpdating) {
         return;
       }
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
index dc434f6c7..d699923f5 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -38,7 +38,7 @@ const currentSortBy = computed(() => {
   );
 });
 
-const chatStatusOptions = [
+const chatStatusOptions = computed(() => [
   {
     label: t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.open.TEXT'),
     value: 'open',
@@ -59,9 +59,9 @@ const chatStatusOptions = [
     label: t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.all.TEXT'),
     value: 'all',
   },
-];
+]);
 
-const chatSortOptions = [
+const chatSortOptions = computed(() => [
   {
     label: t('CHAT_LIST.SORT_ORDER_ITEMS.last_activity_at_asc.TEXT'),
     value: 'last_activity_at_asc',
@@ -94,15 +94,18 @@ const chatSortOptions = [
     label: t('CHAT_LIST.SORT_ORDER_ITEMS.waiting_since_desc.TEXT'),
     value: 'waiting_since_desc',
   },
-];
+]);
 
 const activeChatStatusLabel = computed(
   () =>
-    chatStatusOptions.find(m => m.value === chatStatusFilter.value)?.label || ''
+    chatStatusOptions.value.find(m => m.value === chatStatusFilter.value)
+      ?.label || ''
 );
 
 const activeChatSortLabel = computed(
-  () => chatSortOptions.find(m => m.value === chatSortFilter.value)?.label || ''
+  () =>
+    chatSortOptions.value.find(m => m.value === chatSortFilter.value)?.label ||
+    ''
 );
 
 const saveSelectedFilter = (type, value) => {
diff --git a/app/javascript/dashboard/composables/spec/useImpersonation.spec.js b/app/javascript/dashboard/composables/spec/useImpersonation.spec.js
new file mode 100644
index 000000000..e21892655
--- /dev/null
+++ b/app/javascript/dashboard/composables/spec/useImpersonation.spec.js
@@ -0,0 +1,37 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { useImpersonation } from '../useImpersonation';
+
+vi.mock('shared/helpers/sessionStorage', () => ({
+  __esModule: true,
+  default: {
+    get: vi.fn(),
+    set: vi.fn(),
+  },
+}));
+
+import SessionStorage from 'shared/helpers/sessionStorage';
+import { SESSION_STORAGE_KEYS } from 'dashboard/constants/sessionStorage';
+
+describe('useImpersonation', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should return true if impersonation flag is set in session storage', () => {
+    SessionStorage.get.mockReturnValue(true);
+    const { isImpersonating } = useImpersonation();
+    expect(isImpersonating.value).toBe(true);
+    expect(SessionStorage.get).toHaveBeenCalledWith(
+      SESSION_STORAGE_KEYS.IMPERSONATION_USER
+    );
+  });
+
+  it('should return false if impersonation flag is not set in session storage', () => {
+    SessionStorage.get.mockReturnValue(false);
+    const { isImpersonating } = useImpersonation();
+    expect(isImpersonating.value).toBe(false);
+    expect(SessionStorage.get).toHaveBeenCalledWith(
+      SESSION_STORAGE_KEYS.IMPERSONATION_USER
+    );
+  });
+});
diff --git a/app/javascript/dashboard/composables/useImpersonation.js b/app/javascript/dashboard/composables/useImpersonation.js
new file mode 100644
index 000000000..4728a02f7
--- /dev/null
+++ b/app/javascript/dashboard/composables/useImpersonation.js
@@ -0,0 +1,10 @@
+import { computed } from 'vue';
+import SessionStorage from 'shared/helpers/sessionStorage';
+import { SESSION_STORAGE_KEYS } from 'dashboard/constants/sessionStorage';
+
+export function useImpersonation() {
+  const isImpersonating = computed(() => {
+    return SessionStorage.get(SESSION_STORAGE_KEYS.IMPERSONATION_USER);
+  });
+  return { isImpersonating };
+}
diff --git a/app/javascript/dashboard/constants/sessionStorage.js b/app/javascript/dashboard/constants/sessionStorage.js
new file mode 100644
index 000000000..72dc5e0f3
--- /dev/null
+++ b/app/javascript/dashboard/constants/sessionStorage.js
@@ -0,0 +1,3 @@
+export const SESSION_STORAGE_KEYS = {
+  IMPERSONATION_USER: 'impersonationUser',
+};
diff --git a/app/javascript/dashboard/i18n/locale/en/agentBots.json b/app/javascript/dashboard/i18n/locale/en/agentBots.json
index 128cd1564..194cfb999 100644
--- a/app/javascript/dashboard/i18n/locale/en/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/en/agentBots.json
@@ -59,6 +59,11 @@
         "ERROR_MESSAGE": "Could not update bot. Please try again."
       }
     },
+    "ACCESS_TOKEN": {
+      "TITLE": "Access Token",
+      "DESCRIPTION": "Copy the access token and save it securely",
+      "COPY_SUCCESSFUL": "Access token copied to clipboard"
+    },
     "FORM": {
       "AVATAR": {
         "LABEL": "Bot avatar"
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index fc4509809..4c599ffe8 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -458,6 +458,10 @@
             "PLACEHOLDER": "Add Twitter"
           }
         }
+      },
+      "DELETE_CONTACT": {
+        "MESSAGE": "This action is permanent and irreversible.",
+        "BUTTON": "Delete now"
       }
     },
     "DETAILS": {
@@ -467,7 +471,7 @@
       "DELETE_CONTACT": "Delete contact",
       "DELETE_DIALOG": {
         "TITLE": "Confirm Deletion",
-        "DESCRIPTION": "Are you sure you want to delete this {contactName} contact?",
+        "DESCRIPTION": "Are you sure you want to delete this contact?",
         "CONFIRM": "Yes, Delete",
         "API": {
           "SUCCESS_MESSAGE": "Contact deleted successfully",
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 9767df3ad..9cb504a1d 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -327,12 +327,14 @@
     "NAME": "Captain",
     "HEADER_KNOW_MORE": "Know more",
     "COPILOT": {
+      "TITLE": "Copilot",
       "SEND_MESSAGE": "Send message...",
       "EMPTY_MESSAGE": "There was an error generating the response. Please try again.",
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
       "RESET": "Reset",
+      "SHOW_STEPS": "Show steps",
       "SELECT_ASSISTANT": "Select Assistant",
       "PROMPTS": {
         "SUMMARIZE": {
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 10a21245b..daced76dd 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -185,7 +185,8 @@
           "OFFLINE": "Offline"
         },
         "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
-        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
+        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again",
+        "IMPERSONATING_ERROR": "Cannot change availability while impersonating a user"
       },
       "EMAIL": {
         "LABEL": "Your email address",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotModal.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotModal.vue
index b64b1ef58..97629992a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotModal.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotModal.vue
@@ -5,12 +5,15 @@ import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
 import { required, helpers, url } from '@vuelidate/validators';
 import { useVuelidate } from '@vuelidate/core';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
+import { useToggle } from '@vueuse/core';
 
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import Input from 'dashboard/components-next/input/Input.vue';
 import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import AccessToken from 'dashboard/routes/dashboard/settings/profile/AccessToken.vue';
 
 const props = defineProps({
   type: {
@@ -42,6 +45,9 @@ const formState = reactive({
   botAvatarUrl: '',
 });
 
+const [showAccessToken, toggleAccessToken] = useToggle();
+const accessToken = ref('');
+
 const v$ = useVuelidate(
   {
     botName: {
@@ -70,11 +76,22 @@ const isLoading = computed(() =>
     : uiFlags.value.isUpdating
 );
 
-const dialogTitle = computed(() =>
-  props.type === MODAL_TYPES.CREATE
+const dialogTitle = computed(() => {
+  if (showAccessToken.value) {
+    return t('AGENT_BOTS.ACCESS_TOKEN.TITLE');
+  }
+
+  return props.type === MODAL_TYPES.CREATE
     ? t('AGENT_BOTS.ADD.TITLE')
-    : t('AGENT_BOTS.EDIT.TITLE')
-);
+    : t('AGENT_BOTS.EDIT.TITLE');
+});
+
+const dialogDescription = computed(() => {
+  if (showAccessToken.value) {
+    return t('AGENT_BOTS.ACCESS_TOKEN.DESCRIPTION');
+  }
+  return '';
+});
 
 const confirmButtonLabel = computed(() =>
   props.type === MODAL_TYPES.CREATE
@@ -90,6 +107,13 @@ const botUrlError = computed(() =>
   v$.value.botUrl.$error ? v$.value.botUrl.$errors[0]?.$message : ''
 );
 
+const showAccessTokenInput = computed(
+  () =>
+    showAccessToken.value ||
+    props.type === MODAL_TYPES.EDIT ||
+    accessToken.value
+);
+
 const resetForm = () => {
   Object.assign(formState, {
     botName: '',
@@ -128,6 +152,7 @@ const handleAvatarDelete = async () => {
 const handleSubmit = async () => {
   v$.value.$touch();
   if (v$.value.$invalid) return;
+  if (showAccessToken.value) return;
 
   const botData = {
     name: formState.botName,
@@ -144,7 +169,7 @@ const handleSubmit = async () => {
       ? botData
       : { id: props.selectedBot.id, data: botData };
 
-    await store.dispatch(
+    const response = await store.dispatch(
       `agentBots/${isCreate ? 'create' : 'update'}`,
       actionPayload
     );
@@ -154,7 +179,21 @@ const handleSubmit = async () => {
       : t('AGENT_BOTS.EDIT.API.SUCCESS_MESSAGE');
     useAlert(alertKey);
 
-    dialogRef.value.close();
+    // Show access token after creation
+    if (isCreate) {
+      const { access_token: responseAccessToken, id } = response || {};
+
+      if (id && responseAccessToken) {
+        accessToken.value = responseAccessToken;
+        toggleAccessToken(true);
+      } else {
+        accessToken.value = '';
+        dialogRef.value.close();
+      }
+    } else {
+      dialogRef.value.close();
+    }
+
     resetForm();
   } catch (error) {
     const errorKey = isCreate
@@ -166,17 +205,43 @@ const handleSubmit = async () => {
 
 const initializeForm = () => {
   if (props.selectedBot && Object.keys(props.selectedBot).length) {
-    const { name, description, outgoing_url, thumbnail, bot_config } =
-      props.selectedBot;
+    const {
+      name,
+      description,
+      outgoing_url: botUrl,
+      thumbnail,
+      bot_config: botConfig,
+      access_token: botAccessToken,
+    } = props.selectedBot;
     formState.botName = name || '';
     formState.botDescription = description || '';
-    formState.botUrl = outgoing_url || bot_config?.webhook_url || '';
+    formState.botUrl = botUrl || botConfig?.webhook_url || '';
     formState.botAvatarUrl = thumbnail || '';
+
+    if (botAccessToken && props.type === MODAL_TYPES.EDIT) {
+      accessToken.value = botAccessToken;
+    }
   } else {
     resetForm();
   }
 };
 
+const onCopyToken = async value => {
+  await copyTextToClipboard(value);
+  useAlert(t('COMPONENTS.CODE.COPY_SUCCESSFUL'));
+};
+
+const closeModal = () => {
+  if (!showAccessToken.value) v$.value?.$reset();
+  accessToken.value = '';
+  toggleAccessToken(false);
+};
+
+const onClickClose = () => {
+  closeModal();
+  dialogRef.value.close();
+};
+
 watch(() => props.selectedBot, initializeForm, { immediate: true, deep: true });
 
 defineExpose({ dialogRef });
@@ -187,48 +252,68 @@ defineExpose({ dialogRef });
     ref="dialogRef"
     type="edit"
     :title="dialogTitle"
+    :description="dialogDescription"
     :show-cancel-button="false"
     :show-confirm-button="false"
-    @close="v$.$reset()"
+    @close="closeModal"
   >
     <form class="flex flex-col gap-4" @submit.prevent="handleSubmit">
-      <div class="mb-2 flex flex-col items-start">
-        <span class="mb-2 text-sm font-medium text-n-slate-12">
-          {{ $t('AGENT_BOTS.FORM.AVATAR.LABEL') }}
-        </span>
-        <Avatar
-          :src="formState.botAvatarUrl"
-          :name="formState.botName"
-          :size="68"
-          allow-upload
-          @upload="handleImageUpload"
-          @delete="handleAvatarDelete"
+      <div
+        v-if="!showAccessToken || type === MODAL_TYPES.EDIT"
+        class="flex flex-col gap-4"
+      >
+        <div class="mb-2 flex flex-col items-start">
+          <span class="mb-2 text-sm font-medium text-n-slate-12">
+            {{ $t('AGENT_BOTS.FORM.AVATAR.LABEL') }}
+          </span>
+          <Avatar
+            :src="formState.botAvatarUrl"
+            :name="formState.botName"
+            :size="68"
+            allow-upload
+            icon-name="i-lucide-bot-message-square"
+            @upload="handleImageUpload"
+            @delete="handleAvatarDelete"
+          />
+        </div>
+
+        <Input
+          id="bot-name"
+          v-model="formState.botName"
+          :label="$t('AGENT_BOTS.FORM.NAME.LABEL')"
+          :placeholder="$t('AGENT_BOTS.FORM.NAME.PLACEHOLDER')"
+          :message="botNameError"
+          :message-type="botNameError ? 'error' : 'info'"
+          @blur="v$.botName.$touch()"
+        />
+
+        <TextArea
+          id="bot-description"
+          v-model="formState.botDescription"
+          :label="$t('AGENT_BOTS.FORM.DESCRIPTION.LABEL')"
+          :placeholder="$t('AGENT_BOTS.FORM.DESCRIPTION.PLACEHOLDER')"
+        />
+
+        <Input
+          id="bot-url"
+          v-model="formState.botUrl"
+          :label="$t('AGENT_BOTS.FORM.WEBHOOK_URL.LABEL')"
+          :placeholder="$t('AGENT_BOTS.FORM.WEBHOOK_URL.PLACEHOLDER')"
+          :message="botUrlError"
+          :message-type="botUrlError ? 'error' : 'info'"
+          @blur="v$.botUrl.$touch()"
         />
       </div>
 
-      <Input
-        v-model="formState.botName"
-        :label="$t('AGENT_BOTS.FORM.NAME.LABEL')"
-        :placeholder="$t('AGENT_BOTS.FORM.NAME.PLACEHOLDER')"
-        :message="botNameError"
-        :message-type="botNameError ? 'error' : 'info'"
-        @blur="v$.botName.$touch()"
-      />
-
-      <TextArea
-        v-model="formState.botDescription"
-        :label="$t('AGENT_BOTS.FORM.DESCRIPTION.LABEL')"
-        :placeholder="$t('AGENT_BOTS.FORM.DESCRIPTION.PLACEHOLDER')"
-      />
-
-      <Input
-        v-model="formState.botUrl"
-        :label="$t('AGENT_BOTS.FORM.WEBHOOK_URL.LABEL')"
-        :placeholder="$t('AGENT_BOTS.FORM.WEBHOOK_URL.PLACEHOLDER')"
-        :message="botUrlError"
-        :message-type="botUrlError ? 'error' : 'info'"
-        @blur="v$.botUrl.$touch()"
-      />
+      <div v-if="showAccessTokenInput" class="flex flex-col gap-1">
+        <label
+          v-if="type === MODAL_TYPES.EDIT"
+          class="mb-0.5 text-sm font-medium text-n-slate-12"
+        >
+          {{ $t('AGENT_BOTS.ACCESS_TOKEN.TITLE') }}
+        </label>
+        <AccessToken :value="accessToken" @on-copy="onCopyToken" />
+      </div>
 
       <div class="flex items-center justify-end w-full gap-2 px-0 py-2">
         <NextButton
@@ -236,9 +321,10 @@ defineExpose({ dialogRef });
           slate
           type="reset"
           :label="$t('AGENT_BOTS.FORM.CANCEL')"
-          @click="dialogRef.close()"
+          @click="onClickClose()"
         />
         <NextButton
+          v-if="!showAccessToken"
           type="submit"
           data-testid="label-submit"
           :label="confirmButtonLabel"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AccessToken.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AccessToken.vue
index 87b074e5a..abf547b69 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/AccessToken.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AccessToken.vue
@@ -39,6 +39,7 @@ const onClick = () => {
       <template #masked>
         <button
           class="absolute top-1.5 ltr:right-0.5 rtl:left-0.5"
+          type="button"
           @click="toggleMasked"
         >
           <fluent-icon :icon="maskIcon" :size="16" />
@@ -46,7 +47,7 @@ const onClick = () => {
       </template>
     </woot-input>
     <FormButton
-      type="submit"
+      type="button"
       size="large"
       icon="text-copy"
       variant="outline"
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index fa49af339..b790b2a80 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -2,6 +2,8 @@ import types from '../mutation-types';
 import authAPI from '../../api/auth';
 
 import { setUser, clearCookiesOnLogout } from '../utils/api';
+import SessionStorage from 'shared/helpers/sessionStorage';
+import { SESSION_STORAGE_KEYS } from 'dashboard/constants/sessionStorage';
 
 const initialState = {
   currentUser: {
@@ -145,8 +147,15 @@ export const actions = {
   updateUISettings: async ({ commit }, params) => {
     try {
       commit(types.SET_CURRENT_USER_UI_SETTINGS, params);
-      const response = await authAPI.updateUISettings(params);
-      commit(types.SET_CURRENT_USER, response.data);
+
+      const isImpersonating = SessionStorage.get(
+        SESSION_STORAGE_KEYS.IMPERSONATION_USER
+      );
+
+      if (!isImpersonating) {
+        const response = await authAPI.updateUISettings(params);
+        commit(types.SET_CURRENT_USER, response.data);
+      }
     } catch (error) {
       // Ignore error
     }
diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js
index 281b911b5..470d98df7 100644
--- a/app/javascript/dashboard/store/utils/api.js
+++ b/app/javascript/dashboard/store/utils/api.js
@@ -2,7 +2,9 @@ import fromUnixTime from 'date-fns/fromUnixTime';
 import differenceInDays from 'date-fns/differenceInDays';
 import Cookies from 'js-cookie';
 import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
+import { SESSION_STORAGE_KEYS } from 'dashboard/constants/sessionStorage';
 import { LocalStorage } from 'shared/helpers/localStorage';
+import SessionStorage from 'shared/helpers/sessionStorage';
 import { emitter } from 'shared/helpers/mitt';
 import {
   ANALYTICS_IDENTITY,
@@ -44,6 +46,10 @@ export const clearLocalStorageOnLogout = () => {
   LocalStorage.remove(LOCAL_STORAGE_KEYS.DRAFT_MESSAGES);
 };
 
+export const clearSessionStorageOnLogout = () => {
+  SessionStorage.remove(SESSION_STORAGE_KEYS.IMPERSONATION_USER);
+};
+
 export const deleteIndexedDBOnLogout = async () => {
   let dbs = [];
   try {
@@ -75,6 +81,7 @@ export const clearCookiesOnLogout = () => {
   emitter.emit(ANALYTICS_RESET);
   clearBrowserSessionCookies();
   clearLocalStorageOnLogout();
+  clearSessionStorageOnLogout();
   const globalConfig = window.globalConfig || {};
   const logoutRedirectLink = globalConfig.LOGOUT_REDIRECT_LINK || '/';
   window.location = logoutRedirectLink;
diff --git a/app/javascript/shared/helpers/sessionStorage.js b/app/javascript/shared/helpers/sessionStorage.js
new file mode 100644
index 000000000..db1eca2b8
--- /dev/null
+++ b/app/javascript/shared/helpers/sessionStorage.js
@@ -0,0 +1,26 @@
+export default {
+  clearAll() {
+    window.sessionStorage.clear();
+  },
+
+  get(key) {
+    try {
+      const value = window.sessionStorage.getItem(key);
+      return value ? JSON.parse(value) : null;
+    } catch (error) {
+      return window.sessionStorage.getItem(key);
+    }
+  },
+
+  set(key, value) {
+    if (typeof value === 'object') {
+      window.sessionStorage.setItem(key, JSON.stringify(value));
+    } else {
+      window.sessionStorage.setItem(key, value);
+    }
+  },
+
+  remove(key) {
+    window.sessionStorage.removeItem(key);
+  },
+};
diff --git a/app/javascript/shared/helpers/specs/sessionStorage.spec.js b/app/javascript/shared/helpers/specs/sessionStorage.spec.js
new file mode 100644
index 000000000..899c6435a
--- /dev/null
+++ b/app/javascript/shared/helpers/specs/sessionStorage.spec.js
@@ -0,0 +1,137 @@
+import SessionStorage from '../sessionStorage';
+
+// Mocking sessionStorage
+const sessionStorageMock = (() => {
+  let store = {};
+  return {
+    getItem: key => store[key] || null,
+    setItem: (key, value) => {
+      store[key] = String(value);
+    },
+    removeItem: key => delete store[key],
+    clear: () => {
+      store = {};
+    },
+  };
+})();
+
+Object.defineProperty(window, 'sessionStorage', {
+  value: sessionStorageMock,
+});
+
+describe('SessionStorage utility', () => {
+  beforeEach(() => {
+    sessionStorage.clear();
+  });
+
+  describe('clearAll method', () => {
+    it('should clear all items from sessionStorage', () => {
+      sessionStorage.setItem('testKey1', 'testValue1');
+      sessionStorage.setItem('testKey2', 'testValue2');
+
+      SessionStorage.clearAll();
+
+      expect(sessionStorage.getItem('testKey1')).toBeNull();
+      expect(sessionStorage.getItem('testKey2')).toBeNull();
+    });
+  });
+
+  describe('get method', () => {
+    it('should retrieve and parse JSON values correctly', () => {
+      const testObject = { a: 1, b: 'test' };
+      sessionStorage.setItem('testKey', JSON.stringify(testObject));
+
+      expect(SessionStorage.get('testKey')).toEqual(testObject);
+    });
+
+    it('should return null for non-existent keys', () => {
+      expect(SessionStorage.get('nonExistentKey')).toBeNull();
+    });
+
+    it('should handle non-JSON values by returning the raw value', () => {
+      sessionStorage.setItem('testKey', 'plain string value');
+
+      expect(SessionStorage.get('testKey')).toBe('plain string value');
+    });
+
+    it('should handle malformed JSON gracefully', () => {
+      sessionStorage.setItem('testKey', '{malformed:json}');
+
+      expect(SessionStorage.get('testKey')).toBe('{malformed:json}');
+    });
+  });
+
+  describe('set method', () => {
+    it('should store object values as JSON strings', () => {
+      const testObject = { a: 1, b: 'test' };
+      SessionStorage.set('testKey', testObject);
+
+      expect(sessionStorage.getItem('testKey')).toBe(
+        JSON.stringify(testObject)
+      );
+    });
+
+    it('should store primitive values directly', () => {
+      SessionStorage.set('stringKey', 'test string');
+      expect(sessionStorage.getItem('stringKey')).toBe('test string');
+
+      SessionStorage.set('numberKey', 42);
+      expect(sessionStorage.getItem('numberKey')).toBe('42');
+
+      SessionStorage.set('booleanKey', true);
+      expect(sessionStorage.getItem('booleanKey')).toBe('true');
+    });
+
+    it('should handle null values', () => {
+      SessionStorage.set('nullKey', null);
+
+      expect(sessionStorage.getItem('nullKey')).toBe('null');
+      expect(SessionStorage.get('nullKey')).toBeNull();
+    });
+
+    it('should handle undefined values', () => {
+      SessionStorage.set('undefinedKey', undefined);
+
+      expect(sessionStorage.getItem('undefinedKey')).toBe('undefined');
+    });
+  });
+
+  describe('remove method', () => {
+    it('should remove an item from sessionStorage', () => {
+      SessionStorage.set('testKey', 'testValue');
+      expect(SessionStorage.get('testKey')).toBe('testValue');
+
+      SessionStorage.remove('testKey');
+
+      expect(SessionStorage.get('testKey')).toBeNull();
+    });
+
+    it('should do nothing when removing a non-existent key', () => {
+      expect(() => {
+        SessionStorage.remove('nonExistentKey');
+      }).not.toThrow();
+    });
+  });
+
+  describe('Integration of methods', () => {
+    it('should set, get, and remove values correctly', () => {
+      SessionStorage.set('testKey', { value: 'test' });
+
+      expect(SessionStorage.get('testKey')).toEqual({ value: 'test' });
+
+      SessionStorage.remove('testKey');
+      expect(SessionStorage.get('testKey')).toBeNull();
+    });
+
+    it('should correctly handle impersonation flag (common use case)', () => {
+      SessionStorage.set('impersonationUser', true);
+
+      expect(SessionStorage.get('impersonationUser')).toBe(true);
+
+      expect(sessionStorage.getItem('impersonationUser')).toBe('true');
+
+      SessionStorage.remove('impersonationUser');
+      expect(SessionStorage.get('impersonationUser')).toBeNull();
+    });
+  });
+});
diff --git a/app/javascript/v3/views/login/Index.vue b/app/javascript/v3/views/login/Index.vue
index 7a6fff3a8..a90368d08 100644
--- a/app/javascript/v3/views/login/Index.vue
+++ b/app/javascript/v3/views/login/Index.vue
@@ -6,7 +6,8 @@ import { parseBoolean } from '@chatwoot/utils';
 import { useAlert } from 'dashboard/composables';
 import { required, email } from '@vuelidate/validators';
 import { useVuelidate } from '@vuelidate/core';
-
+import { SESSION_STORAGE_KEYS } from 'dashboard/constants/sessionStorage';
+import SessionStorage from 'shared/helpers/sessionStorage';
 // mixins
 import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 
@@ -21,6 +22,8 @@ const ERROR_MESSAGES = {
   'business-account-only': 'LOGIN.OAUTH.BUSINESS_ACCOUNTS_ONLY',
 };
 
+const IMPERSONATION_URL_SEARCH_KEY = 'impersonation';
+
 export default {
   components: {
     FormInput,
@@ -112,6 +115,14 @@ export default {
       this.loginApi.message = message;
       useAlert(this.loginApi.message);
     },
+    handleImpersonation() {
+      // Detects impersonation mode via URL and sets a session flag to prevent user settings changes during impersonation.
+      const urlParams = new URLSearchParams(window.location.search);
+      const impersonation = urlParams.get(IMPERSONATION_URL_SEARCH_KEY);
+      if (impersonation) {
+        SessionStorage.set(SESSION_STORAGE_KEYS.IMPERSONATION_USER, true);
+      }
+    },
     submitLogin() {
       this.loginApi.hasErrored = false;
       this.loginApi.showLoading = true;
@@ -128,6 +139,7 @@ export default {
 
       login(credentials)
         .then(() => {
+          this.handleImpersonation();
           this.showAlertMessage(this.$t('LOGIN.API.SUCCESS_MESSAGE'));
         })
         .catch(response => {
diff --git a/app/mailboxes/application_mailbox.rb b/app/mailboxes/application_mailbox.rb
index 4fe931b9f..9fc7a435d 100644
--- a/app/mailboxes/application_mailbox.rb
+++ b/app/mailboxes/application_mailbox.rb
@@ -31,7 +31,7 @@ class ApplicationMailbox < ActionMailbox::Base
     end
 
     def in_reply_to_matches?(in_reply_to)
-      Array.wrap(in_reply_to).any? { _1.match?(CONVERSATION_MESSAGE_ID_PATTERN) }
+      Array.wrap(in_reply_to).any? { it.match?(CONVERSATION_MESSAGE_ID_PATTERN) }
     end
 
     # checks if follow this pattern  send it to reply_mailbox
diff --git a/app/models/account.rb b/app/models/account.rb
index 1664ce29b..fb156511b 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -97,8 +97,8 @@ class Account < ApplicationRecord
 
   has_one_attached :contacts_export
 
-  enum locale: LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h
-  enum status: { active: 0, suspended: 1 }
+  enum :locale, LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h, prefix: true
+  enum :status, { active: 0, suspended: 1 }
 
   scope :with_auto_resolve, -> { where("(settings ->> 'auto_resolve_after')::int IS NOT NULL") }
 
diff --git a/app/models/concerns/sso_authenticatable.rb b/app/models/concerns/sso_authenticatable.rb
index e228ca2c2..98b50f336 100644
--- a/app/models/concerns/sso_authenticatable.rb
+++ b/app/models/concerns/sso_authenticatable.rb
@@ -20,6 +20,10 @@ module SsoAuthenticatable
     "#{ENV.fetch('FRONTEND_URL', nil)}/app/login?email=#{encoded_email}&sso_auth_token=#{generate_sso_auth_token}"
   end
 
+  def generate_sso_link_with_impersonation
+    "#{generate_sso_link}&impersonation=true"
+  end
+
   private
 
   def sso_token_key(token)
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index bcb79c05b..3f1a20037 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -128,6 +128,12 @@ class Conversation < ApplicationRecord
     additional_attributes&.dig('conversation_language')
   end
 
+  # Be aware: The precision of created_at and last_activity_at may differ from Ruby's Time precision.
+  # Our DB column (see schema) stores timestamps with second-level precision (no microseconds), so
+  # if you assign a Ruby Time with microseconds, the DB will truncate it. This may cause subtle differences
+  # if you compare or copy these values in Ruby, also in our specs
+  # So in specs rely on to be_with(1.second) instead of to eq()
+  # TODO: Migrate to use a timestamp with microsecond precision
   def last_activity_at
     self[:last_activity_at] || created_at
   end
diff --git a/app/models/email_template.rb b/app/models/email_template.rb
index 5891626a4..57db7a94c 100644
--- a/app/models/email_template.rb
+++ b/app/models/email_template.rb
@@ -16,8 +16,8 @@
 #  index_email_templates_on_name_and_account_id  (name,account_id) UNIQUE
 #
 class EmailTemplate < ApplicationRecord
-  enum locale: LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h
-  enum template_type: { layout: 0, content: 1 }
+  enum :locale, LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h, prefix: true
+  enum :template_type, { layout: 0, content: 1 }
   belongs_to :account, optional: true
 
   validates :name, uniqueness: { scope: :account }
diff --git a/app/models/installation_config.rb b/app/models/installation_config.rb
index f1603e4ca..5ea438916 100644
--- a/app/models/installation_config.rb
+++ b/app/models/installation_config.rb
@@ -19,7 +19,7 @@ class InstallationConfig < ApplicationRecord
   # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
   # FIX ME : fixes breakage of installation config. we need to migrate.
   # Fix configuration in application.rb
-  serialize :serialized_value, ActiveSupport::HashWithIndifferentAccess
+  serialize :serialized_value, coder: YAML, type: ActiveSupport::HashWithIndifferentAccess
 
   before_validation :set_lock
   validates :name, presence: true
@@ -32,6 +32,10 @@ class InstallationConfig < ApplicationRecord
   after_commit :clear_cache
 
   def value
+    # This is an extra hack again cause of the YAML serialization, in case of new object initialization in super admin
+    # It was throwing error as the default value of column '{}' was failing in deserialization.
+    return {}.with_indifferent_access if new_record? && @attributes['serialized_value']&.value_before_type_cast == '{}'
+
     serialized_value[:value]
   end
 
diff --git a/app/models/message.rb b/app/models/message.rb
index f5d7712d2..a952e0265 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -185,7 +185,13 @@ class Message < ApplicationRecord
     # move this to a presenter
     return self[:content] if !input_csat? || inbox.web_widget?
 
-    I18n.t('conversations.survey.response', link: "#{ENV.fetch('FRONTEND_URL', nil)}/survey/responses/#{conversation.uuid}")
+    survey_link = "#{ENV.fetch('FRONTEND_URL', nil)}/survey/responses/#{conversation.uuid}"
+
+    if inbox.csat_config&.dig('message').present?
+      "#{inbox.csat_config['message']} #{survey_link}"
+    else
+      I18n.t('conversations.survey.response', link: survey_link)
+    end
   end
 
   def email_notifiable_message?
diff --git a/app/models/user.rb b/app/models/user.rb
index 5594b0ca6..d1907362a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -109,8 +109,8 @@ class User < ApplicationRecord
     self.email = email.try(:downcase)
   end
 
-  def send_devise_notification(notification, *args)
-    devise_mailer.with(account: Current.account).send(notification, self, *args).deliver_later
+  def send_devise_notification(notification, *)
+    devise_mailer.with(account: Current.account).send(notification, self, *).deliver_later
   end
 
   def set_password_and_uid
diff --git a/app/services/account/sign_up_email_validation_service.rb b/app/services/account/sign_up_email_validation_service.rb
new file mode 100644
index 000000000..8889145b2
--- /dev/null
+++ b/app/services/account/sign_up_email_validation_service.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class Account::SignUpEmailValidationService
+  include CustomExceptions::Account
+  attr_reader :email
+
+  def initialize(email)
+    @email = email
+  end
+
+  def perform
+    address = ValidEmail2::Address.new(email)
+
+    raise InvalidEmail.new({ valid: false, disposable: nil }) unless address.valid?
+
+    raise InvalidEmail.new({ domain_blocked: true }) if domain_blocked?
+
+    raise InvalidEmail.new({ valid: true, disposable: true }) if address.disposable?
+
+    true
+  end
+
+  private
+
+  def domain_blocked?
+    domain = email.split('@').last&.downcase
+    blocked_domains.any? { |blocked_domain| domain.match?(blocked_domain.downcase) }
+  end
+
+  def blocked_domains
+    domains = GlobalConfigService.load('BLOCKED_EMAIL_DOMAINS', '')
+    return [] if domains.blank?
+
+    domains.split("\n").map(&:strip)
+  end
+end
diff --git a/app/services/conversations/filter_service.rb b/app/services/conversations/filter_service.rb
index 21fe3c716..db2892c31 100644
--- a/app/services/conversations/filter_service.rb
+++ b/app/services/conversations/filter_service.rb
@@ -28,16 +28,6 @@ class Conversations::FilterService < FilterService
       :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :messages, :contact_inbox
     )
 
-    account_user = @account.account_users.find_by(user_id: @user.id)
-    is_administrator = account_user&.role == 'administrator'
-
-    # Ensure we only include conversations from inboxes the user has access to
-    unless is_administrator
-      inbox_ids = @user.inboxes.where(account_id: @account.id).pluck(:id)
-      conversations = conversations.where(inbox_id: inbox_ids)
-    end
-
-    # Apply permission-based filtering
     Conversations::PermissionFilterService.new(
       conversations,
       @user,
diff --git a/app/services/conversations/permission_filter_service.rb b/app/services/conversations/permission_filter_service.rb
index a8561dbdf..31dd011d7 100644
--- a/app/services/conversations/permission_filter_service.rb
+++ b/app/services/conversations/permission_filter_service.rb
@@ -8,9 +8,23 @@ class Conversations::PermissionFilterService
   end
 
   def perform
-    # The base implementation simply returns all conversations
-    # Enterprise edition extends this with permission-based filtering
-    conversations
+    return conversations if user_role == 'administrator'
+
+    accessible_conversations
+  end
+
+  private
+
+  def accessible_conversations
+    conversations.where(inbox: user.inboxes.where(account_id: account.id))
+  end
+
+  def account_user
+    AccountUser.find_by(account_id: account.id, user_id: user.id)
+  end
+
+  def user_role
+    account_user&.role
   end
 end
 
diff --git a/app/services/crm/leadsquared/lead_finder_service.rb b/app/services/crm/leadsquared/lead_finder_service.rb
index cf3014099..59318b818 100644
--- a/app/services/crm/leadsquared/lead_finder_service.rb
+++ b/app/services/crm/leadsquared/lead_finder_service.rb
@@ -31,7 +31,11 @@ class Crm::Leadsquared::LeadFinderService
   def find_by_phone_number(contact)
     return if contact.phone_number.blank?
 
-    search_by_field(contact.phone_number)
+    lead_data = Crm::Leadsquared::Mappers::ContactMapper.map(contact)
+
+    return if lead_data.blank? || lead_data['Mobile'].nil?
+
+    search_by_field(lead_data['Mobile'])
   end
 
   def search_by_field(value)
diff --git a/app/services/crm/leadsquared/mappers/contact_mapper.rb b/app/services/crm/leadsquared/mappers/contact_mapper.rb
index 0196116bb..dc51a1498 100644
--- a/app/services/crm/leadsquared/mappers/contact_mapper.rb
+++ b/app/services/crm/leadsquared/mappers/contact_mapper.rb
@@ -20,11 +20,29 @@ class Crm::Leadsquared::Mappers::ContactMapper
       'FirstName' => contact.name.presence,
       'LastName' => contact.last_name.presence,
       'EmailAddress' => contact.email.presence,
-      'Mobile' => contact.phone_number.presence,
+      'Mobile' => formatted_phone_number,
       'Source' => brand_name
     }.compact
   end
 
+  def formatted_phone_number
+    # it seems like leadsquared needs a different phone number format
+    # it's not documented anywhere, so don't bother trying to look up online
+    # After some trial and error, I figured out the format, its +<country_code>-<national_number>
+    return nil if contact.phone_number.blank?
+
+    parsed = TelephoneNumber.parse(contact.phone_number)
+    return contact.phone_number unless parsed.valid?
+
+    country_code = parsed.country.country_code
+    e164 = parsed.e164_number
+    e164 = e164.sub(/^\+/, '')
+
+    national_number = e164.sub(/^#{Regexp.escape(country_code)}/, '')
+
+    "+#{country_code}-#{national_number}"
+  end
+
   def brand_name
     ::GlobalConfig.get('BRAND_NAME')['BRAND_NAME'] || 'Chatwoot'
   end
diff --git a/app/services/message_templates/template/csat_survey.rb b/app/services/message_templates/template/csat_survey.rb
index 3a7ca2605..dd9cf3bd6 100644
--- a/app/services/message_templates/template/csat_survey.rb
+++ b/app/services/message_templates/template/csat_survey.rb
@@ -12,7 +12,6 @@ class MessageTemplates::Template::CsatSurvey
   private
 
   delegate :contact, :account, :inbox, to: :conversation
-  delegate :csat_config, to: :inbox
 
   def should_send_csat_survey?
     return true unless survey_rules_configured?
diff --git a/app/services/twilio/incoming_message_service.rb b/app/services/twilio/incoming_message_service.rb
index 7a335c87d..c38577599 100644
--- a/app/services/twilio/incoming_message_service.rb
+++ b/app/services/twilio/incoming_message_service.rb
@@ -137,14 +137,19 @@ class Twilio::IncomingMessageService
   end
 
   def download_with_auth(media_url)
-    Down.download(
-      media_url,
-      http_basic_authentication: [twilio_channel.account_sid, twilio_channel.auth_token || twilio_channel.api_key_sid]
-    )
+    auth_credentials = if twilio_channel.api_key_sid.present?
+                         # When using api_key_sid, the auth token should be the api_secret_key
+                         [twilio_channel.api_key_sid, twilio_channel.auth_token]
+                       else
+                         # When using account_sid, the auth token is the account's auth token
+                         [twilio_channel.account_sid, twilio_channel.auth_token]
+                       end
+
+    Down.download(media_url, http_basic_authentication: auth_credentials)
   end
 
   def handle_download_attachment_error(error, media_url)
-    Rails.logger.info "Error downloading attachment from Twilio: #{error.message}: Retrying"
+    Rails.logger.info "Error downloading attachment from Twilio: #{error.message}: Retrying without auth"
     Down.download(media_url)
   rescue StandardError => e
     Rails.logger.info "Error downloading attachment from Twilio: #{e.message}: Skipping"
diff --git a/app/views/platform/api/v1/users/token.json.jbuilder b/app/views/platform/api/v1/users/token.json.jbuilder
new file mode 100644
index 000000000..d9d5468d7
--- /dev/null
+++ b/app/views/platform/api/v1/users/token.json.jbuilder
@@ -0,0 +1,9 @@
+json.access_token @resource.access_token.token
+json.expiry nil
+json.user do
+  json.id @resource.id
+  json.name @resource.name
+  json.display_name @resource.display_name
+  json.email @resource.email
+  json.pubsub_token @resource.pubsub_token
+end
diff --git a/app/views/super_admin/users/_impersonate.erb b/app/views/super_admin/users/_impersonate.erb
index dff1cda57..4d758b88d 100644
--- a/app/views/super_admin/users/_impersonate.erb
+++ b/app/views/super_admin/users/_impersonate.erb
@@ -2,7 +2,7 @@
  <hr/>
   <div class="form-actions">
   <p class="text-color-red">Caution: Any actions executed after impersonate will appear as if performed by the impersonated user - [<%= page.resource.name %> ]</p>
-    <a class='button' target='_blank' href='<%= page.resource.generate_sso_link %>'>Impersonate user </a>
+    <a class='button' target='_blank' href='<%= page.resource.generate_sso_link_with_impersonation %>'>Impersonate user </a>
   </div>
 </section>
 
diff --git a/config/app.yml b/config/app.yml
index 9afc3f7bc..36bbdbcf1 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '4.1.0'
+  version: '4.2.0'
 
 development:
   <<: *shared
diff --git a/config/initializers/01_redis.rb b/config/initializers/01_redis.rb
index 664dcd435..93c12fce7 100644
--- a/config/initializers/01_redis.rb
+++ b/config/initializers/01_redis.rb
@@ -1,3 +1,7 @@
+# TODO: Phase out the custom ConnectionPool wrappers ($alfred / $velma),
+# switch to plain Redis clients here and let Rails 7.1+ handle pooling
+# via `pool:` in RedisCacheStore (see rack_attack initializer).
+
 # Alfred
 # Add here as you use it for more features
 # Used for Round Robin, Conversation Emails & Online Presence
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 1d516370f..38878d456 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -14,6 +14,10 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
     if ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false)) || Rails.env.development?
       resource '*', headers: :any, methods: :any, expose: %w[access-token client uid expiry]
     end
+
+    if ActiveModel::Type::Boolean.new.cast(ENV.fetch('ENABLE_API_CORS', false))
+      resource '/api/*', headers: :any, methods: :any, expose: %w[access-token client uid expiry]
+    end
   end
 end
 
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index fdbd47008..fe3f6c554 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -11,7 +11,12 @@ class Rack::Attack
   # Rack::Attack.cache.store = ActiveSupport::Cache::MemoryStore.new
 
   # https://github.com/rack/rack-attack/issues/102
-  Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new(redis: $velma)
+  # Rails 7.1 automatically adds its own ConnectionPool around RedisCacheStore.
+  # Because `$velma` is *already* a ConnectionPool, double-wrapping causes
+  # Redis calls like `get` to hit the outer wrapper and explode.
+  # `pool: false` tells Rails to skip its internal pool and use ours directly.
+  # TODO: We can use build in connection pool in future upgrade
+  Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new(redis: $velma, pool: false)
 
   class Request < ::Rack::Request
     # You many need to specify a method to fetch the correct remote IP address
diff --git a/config/routes.rb b/config/routes.rb
index ee6ec5e8a..13866f01e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -396,6 +396,7 @@ Rails.application.routes.draw do
         resources :users, only: [:create, :show, :update, :destroy] do
           member do
             get :login
+            post :token
           end
         end
         resources :agent_bots, only: [:index, :create, :show, :update, :destroy] do
diff --git a/deployment/chatwoot-web.1.service b/deployment/chatwoot-web.1.service
index 049ec85db..0d1d33804 100644
--- a/deployment/chatwoot-web.1.service
+++ b/deployment/chatwoot-web.1.service
@@ -16,10 +16,10 @@ KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
 
-Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.3.3/bin:/home/chatwoot/.rvm/gems/ruby-3.3.3@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.3.3/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
+Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.4.4/bin:/home/chatwoot/.rvm/gems/ruby-3.4.4@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.4.4/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
 Environment="PORT=3000"
 Environment="RAILS_ENV=production"
 Environment="NODE_ENV=production"
 Environment="RAILS_LOG_TO_STDOUT=true"
-Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.3.3"
-Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.3.3:/home/chatwoot/.rvm/gems/ruby-3.3.3@global"
+Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.4.4"
+Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.4.4:/home/chatwoot/.rvm/gems/ruby-3.4.4@global"
diff --git a/deployment/chatwoot-worker.1.service b/deployment/chatwoot-worker.1.service
index 04ee83a69..ea893d20c 100644
--- a/deployment/chatwoot-worker.1.service
+++ b/deployment/chatwoot-worker.1.service
@@ -21,10 +21,10 @@ MemoryHigh=1.4G
 MemorySwapMax=0
 OOMPolicy=stop
 
-Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.3.3/bin:/home/chatwoot/.rvm/gems/ruby-3.3.3@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.3.3/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
+Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.4.4/bin:/home/chatwoot/.rvm/gems/ruby-3.4.4@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.4.4/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
 Environment="PORT=3000"
 Environment="RAILS_ENV=production"
 Environment="NODE_ENV=production"
 Environment="RAILS_LOG_TO_STDOUT=true"
-Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.3.3"
-Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.3.3:/home/chatwoot/.rvm/gems/ruby-3.3.3@global"
+Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.4.4"
+Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.4.4:/home/chatwoot/.rvm/gems/ruby-3.4.4@global"
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 7809b6d0e..75320bbd3 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -338,8 +338,8 @@ function setup_chatwoot() {
   sudo -i -u chatwoot << EOF
   rvm --version
   rvm autolibs disable
-  rvm install "ruby-3.3.3"
-  rvm use 3.3.3 --default
+  rvm install "ruby-3.4.4"
+  rvm use 3.4.4 --default
 
   git clone https://github.com/chatwoot/chatwoot.git
   cd chatwoot
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 008884ce1..2d753337d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # pre-build stage
 FROM node:23-alpine as node
-FROM ruby:3.3.3-alpine3.19 AS pre-builder
+FROM ruby:3.4.4-alpine3.21 AS pre-builder
 
 ARG NODE_VERSION="23.7.0"
 ARG PNPM_VERSION="10.2.0"
@@ -90,13 +90,13 @@ RUN if [ "$RAILS_ENV" = "production" ]; then \
 RUN git rev-parse HEAD > /app/.git_sha
 
 # Remove unnecessary files
-RUN rm -rf /gems/ruby/3.3.0/cache/*.gem \
-  && find /gems/ruby/3.3.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete \
+RUN rm -rf /gems/ruby/3.4.0/cache/*.gem \
+  && find /gems/ruby/3.4.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete \
   && rm -rf .git \
   && rm .gitignore
 
 # final build stage
-FROM ruby:3.3.3-alpine3.19
+FROM ruby:3.4.4-alpine3.21
 
 ARG NODE_VERSION="23.7.0"
 ARG PNPM_VERSION="10.2.0"
diff --git a/enterprise/app/controllers/api/v1/accounts/custom_roles_controller.rb b/enterprise/app/controllers/api/v1/accounts/custom_roles_controller.rb
index 01650a7de..2d6823b90 100644
--- a/enterprise/app/controllers/api/v1/accounts/custom_roles_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/custom_roles_controller.rb
@@ -6,12 +6,12 @@ class Api::V1::Accounts::CustomRolesController < Api::V1::Accounts::EnterpriseAc
     @custom_roles = Current.account.custom_roles
   end
 
+  def show; end
+
   def create
     @custom_role = Current.account.custom_roles.create!(permitted_params)
   end
 
-  def show; end
-
   def update
     @custom_role.update!(permitted_params)
   end
diff --git a/enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb b/enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb
index e64256bc7..ec879b042 100644
--- a/enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb
@@ -6,12 +6,12 @@ class Api::V1::Accounts::SlaPoliciesController < Api::V1::Accounts::EnterpriseAc
     @sla_policies = Current.account.sla_policies
   end
 
+  def show; end
+
   def create
     @sla_policy = Current.account.sla_policies.create!(permitted_params)
   end
 
-  def show; end
-
   def update
     @sla_policy.update!(permitted_params)
   end
diff --git a/enterprise/app/helpers/captain/chat_helper.rb b/enterprise/app/helpers/captain/chat_helper.rb
index 146e8f813..bbe3851f0 100644
--- a/enterprise/app/helpers/captain/chat_helper.rb
+++ b/enterprise/app/helpers/captain/chat_helper.rb
@@ -1,24 +1,4 @@
 module Captain::ChatHelper
-  def search_documentation_tool
-    {
-      type: 'function',
-      function: {
-        name: 'search_documentation',
-        description: "Use this function to get documentation on functionalities you don't know about.",
-        parameters: {
-          type: 'object',
-          properties: {
-            search_query: {
-              type: 'string',
-              description: 'The search query to look up in the documentation.'
-            }
-          },
-          required: ['search_query']
-        }
-      }
-    }
-  end
-
   def request_chat_completion
     Rails.logger.debug { "[CAPTAIN][ChatCompletion] #{@messages}" }
 
@@ -26,13 +6,12 @@ module Captain::ChatHelper
       parameters: {
         model: @model,
         messages: @messages,
-        tools: [search_documentation_tool],
+        tools: @tool_registry&.registered_tools || [],
         response_format: { type: 'json_object' }
       }
     )
 
     handle_response(response)
-    @response
   end
 
   def handle_response(response)
@@ -41,7 +20,7 @@ module Captain::ChatHelper
     if message['tool_calls']
       process_tool_calls(message['tool_calls'])
     else
-      @response = JSON.parse(message['content'].strip)
+      JSON.parse(message['content'].strip)
     end
   end
 
@@ -54,38 +33,20 @@ module Captain::ChatHelper
   end
 
   def process_tool_call(tool_call)
+    arguments = JSON.parse(tool_call['function']['arguments'])
+    function_name = tool_call['function']['name']
     tool_call_id = tool_call['id']
 
-    if tool_call['function']['name'] == 'search_documentation'
-      query = JSON.parse(tool_call['function']['arguments'])['search_query']
-      sections = fetch_documentation(query)
-      append_tool_response(sections, tool_call_id)
+    if @tool_registry.respond_to?(function_name)
+      execute_tool(function_name, arguments, tool_call_id)
     else
-      append_tool_response('', tool_call_id)
+      process_invalid_tool_call(tool_call_id)
     end
   end
 
-  def fetch_documentation(query)
-    Rails.logger.debug { "[CAPTAIN][DocumentationSearch] #{query}" }
-    @assistant
-      .responses
-      .approved
-      .search(query)
-      .map { |response| format_response(response) }.join
-  end
-
-  def format_response(response)
-    formatted_response = "
-    Question: #{response.question}
-    Answer: #{response.answer}
-    "
-    if response.documentable.present? && response.documentable.try(:external_link)
-      formatted_response += "
-      Source: #{response.documentable.external_link}
-      "
-    end
-
-    formatted_response
+  def execute_tool(function_name, arguments, tool_call_id)
+    result = @tool_registry.send(function_name, arguments)
+    append_tool_response(result, tool_call_id)
   end
 
   def append_tool_calls(tool_calls)
@@ -95,11 +56,15 @@ module Captain::ChatHelper
     }
   end
 
-  def append_tool_response(sections, tool_call_id)
+  def process_invalid_tool_call(tool_call_id)
+    append_tool_response('Tool not available', tool_call_id)
+  end
+
+  def append_tool_response(content, tool_call_id)
     @messages << {
       role: 'tool',
       tool_call_id: tool_call_id,
-      content: "Found the following FAQs in the documentation:\n #{sections}"
+      content: content
     }
   end
 end
diff --git a/enterprise/app/jobs/captain/conversation/response_builder_job.rb b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
index 39a12b662..c661caebe 100644
--- a/enterprise/app/jobs/captain/conversation/response_builder_job.rb
+++ b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
@@ -50,7 +50,7 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
   def message_content(message)
     return message.content if message.content.present?
 
-    'User has shared an attachment' if message.attachments.any?
+    return 'User has shared an attachment' if message.attachments.any?
 
     'User has shared a message without content'
   end
diff --git a/enterprise/app/services/captain/copilot/chat_service.rb b/enterprise/app/services/captain/copilot/chat_service.rb
index 6fd3c4e68..202348825 100644
--- a/enterprise/app/services/captain/copilot/chat_service.rb
+++ b/enterprise/app/services/captain/copilot/chat_service.rb
@@ -10,6 +10,8 @@ class Captain::Copilot::ChatService < Llm::BaseOpenAiService
     @conversation_history = config[:conversation_history]
     @previous_messages = config[:previous_messages] || []
     @language = config[:language] || 'english'
+
+    register_tools
     @messages = [system_message, conversation_history_context] + @previous_messages
     @response = ''
   end
@@ -25,6 +27,11 @@ class Captain::Copilot::ChatService < Llm::BaseOpenAiService
 
   private
 
+  def register_tools
+    @tool_registry = Captain::ToolRegistryService.new(@assistant)
+    @tool_registry.register_tool(Captain::Tools::SearchDocumentationService)
+  end
+
   def system_message
     {
       role: 'system',
diff --git a/enterprise/app/services/captain/llm/assistant_chat_service.rb b/enterprise/app/services/captain/llm/assistant_chat_service.rb
index 50688f18b..8077b22c9 100644
--- a/enterprise/app/services/captain/llm/assistant_chat_service.rb
+++ b/enterprise/app/services/captain/llm/assistant_chat_service.rb
@@ -9,6 +9,7 @@ class Captain::Llm::AssistantChatService < Llm::BaseOpenAiService
     @assistant = assistant
     @messages = [system_message]
     @response = ''
+    register_tools
   end
 
   def generate_response(input, previous_messages = [], role = 'user')
@@ -19,6 +20,11 @@ class Captain::Llm::AssistantChatService < Llm::BaseOpenAiService
 
   private
 
+  def register_tools
+    @tool_registry = Captain::ToolRegistryService.new(@assistant)
+    @tool_registry.register_tool(Captain::Tools::SearchDocumentationService)
+  end
+
   def system_message
     {
       role: 'system',
diff --git a/enterprise/app/services/captain/tool_registry_service.rb b/enterprise/app/services/captain/tool_registry_service.rb
new file mode 100644
index 000000000..8d6632e57
--- /dev/null
+++ b/enterprise/app/services/captain/tool_registry_service.rb
@@ -0,0 +1,30 @@
+class Captain::ToolRegistryService
+  attr_reader :registered_tools, :tools
+
+  def initialize(assistant, user: nil)
+    @assistant = assistant
+    @user = user
+    @registered_tools = []
+    @tools = {}
+  end
+
+  def register_tool(tool_class)
+    tool = tool_class.new(@assistant, user: @user)
+    return unless tool.active?
+
+    @tools[tool.name] = tool
+    @registered_tools << tool.to_registry_format
+  end
+
+  def method_missing(method_name, *)
+    if @tools.key?(method_name.to_s)
+      @tools[method_name.to_s].execute(*)
+    else
+      super
+    end
+  end
+
+  def respond_to_missing?(method_name, include_private = false)
+    @tools.key?(method_name.to_s) || super
+  end
+end
diff --git a/enterprise/app/services/captain/tools/base_service.rb b/enterprise/app/services/captain/tools/base_service.rb
new file mode 100644
index 000000000..72fde2df8
--- /dev/null
+++ b/enterprise/app/services/captain/tools/base_service.rb
@@ -0,0 +1,53 @@
+class Captain::Tools::BaseService
+  attr_accessor :assistant
+
+  def initialize(assistant, user: nil)
+    @assistant = assistant
+    @user = user
+  end
+
+  def name
+    raise NotImplementedError, "#{self.class} must implement name"
+  end
+
+  def description
+    raise NotImplementedError, "#{self.class} must implement description"
+  end
+
+  def parameters
+    raise NotImplementedError, "#{self.class} must implement parameters"
+  end
+
+  def execute(arguments)
+    raise NotImplementedError, "#{self.class} must implement execute"
+  end
+
+  def to_registry_format
+    {
+      type: 'function',
+      function: {
+        name: name,
+        description: description,
+        parameters: parameters
+      }
+    }
+  end
+
+  def active?
+    true
+  end
+
+  private
+
+  def user_has_permission(permission)
+    return false if @user.blank?
+
+    account_user = AccountUser.find_by(account_id: @assistant.account_id, user_id: @user.id)
+    return false if account_user.blank?
+
+    return account_user.custom_role.permissions.include?(permission) if account_user.custom_role.present?
+
+    # Default permission for agents without custom roles
+    account_user.administrator? || account_user.agent?
+  end
+end
diff --git a/enterprise/app/services/captain/tools/copilot/get_article_service.rb b/enterprise/app/services/captain/tools/copilot/get_article_service.rb
new file mode 100644
index 000000000..9c2ee02da
--- /dev/null
+++ b/enterprise/app/services/captain/tools/copilot/get_article_service.rb
@@ -0,0 +1,39 @@
+class Captain::Tools::Copilot::GetArticleService < Captain::Tools::BaseService
+  def name
+    'get_article'
+  end
+
+  def description
+    'Get details of an article including its content and metadata'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: {
+        article_id: {
+          type: 'number',
+          description: 'The ID of the article to retrieve'
+        }
+      },
+      required: %w[article_id]
+    }
+  end
+
+  def execute(arguments)
+    article_id = arguments['article_id']
+
+    Rails.logger.info { "#{self.class.name}: Article ID: #{article_id}" }
+
+    return 'Missing required parameters' if article_id.blank?
+
+    article = Article.find_by(id: article_id, account_id: @assistant.account_id)
+    return 'Article not found' if article.nil?
+
+    article.to_llm_text
+  end
+
+  def active?
+    user_has_permission('knowledge_base_manage')
+  end
+end
diff --git a/enterprise/app/services/captain/tools/copilot/get_contact_service.rb b/enterprise/app/services/captain/tools/copilot/get_contact_service.rb
new file mode 100644
index 000000000..290433301
--- /dev/null
+++ b/enterprise/app/services/captain/tools/copilot/get_contact_service.rb
@@ -0,0 +1,39 @@
+class Captain::Tools::Copilot::GetContactService < Captain::Tools::BaseService
+  def name
+    'get_contact'
+  end
+
+  def description
+    'Get details of a contact including their profile information'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: {
+        contact_id: {
+          type: 'number',
+          description: 'The ID of the contact to retrieve'
+        }
+      },
+      required: %w[contact_id]
+    }
+  end
+
+  def execute(arguments)
+    contact_id = arguments['contact_id']
+
+    Rails.logger.info "#{self.class.name}: Contact ID: #{contact_id}"
+
+    return 'Missing required parameters' if contact_id.blank?
+
+    contact = Contact.find_by(id: contact_id, account_id: @assistant.account_id)
+    return 'Contact not found' if contact.nil?
+
+    contact.to_llm_text
+  end
+
+  def active?
+    user_has_permission('contact_manage')
+  end
+end
diff --git a/enterprise/app/services/captain/tools/copilot/get_conversation_service.rb b/enterprise/app/services/captain/tools/copilot/get_conversation_service.rb
new file mode 100644
index 000000000..64b52d012
--- /dev/null
+++ b/enterprise/app/services/captain/tools/copilot/get_conversation_service.rb
@@ -0,0 +1,41 @@
+class Captain::Tools::Copilot::GetConversationService < Captain::Tools::BaseService
+  def name
+    'get_conversation'
+  end
+
+  def description
+    'Get details of a conversation including messages and contact information'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: {
+        conversation_id: {
+          type: 'number',
+          description: 'The ID of the conversation to retrieve'
+        }
+      },
+      required: %w[conversation_id]
+    }
+  end
+
+  def execute(arguments)
+    conversation_id = arguments['conversation_id']
+
+    Rails.logger.info "#{self.class.name}: Conversation ID: #{conversation_id}"
+
+    return 'Missing required parameters' if conversation_id.blank?
+
+    conversation = Conversation.find_by(display_id: conversation_id, account_id: @assistant.account_id)
+    return 'Conversation not found' if conversation.blank?
+
+    conversation.to_llm_text
+  end
+
+  def active?
+    user_has_permission('conversation_manage') ||
+      user_has_permission('conversation_unassigned_manage') ||
+      user_has_permission('conversation_participating_manage')
+  end
+end
diff --git a/enterprise/app/services/captain/tools/copilot/search_articles_service.rb b/enterprise/app/services/captain/tools/copilot/search_articles_service.rb
new file mode 100644
index 000000000..5061968ad
--- /dev/null
+++ b/enterprise/app/services/captain/tools/copilot/search_articles_service.rb
@@ -0,0 +1,71 @@
+class Captain::Tools::Copilot::SearchArticlesService < Captain::Tools::BaseService
+  def name
+    'search_articles'
+  end
+
+  def description
+    'Search articles based on parameters'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: properties,
+      required: ['query']
+    }
+  end
+
+  def execute(arguments)
+    query = arguments['query']
+    category_id = arguments['category_id']
+    status = arguments['status']
+
+    Rails.logger.info "#{self.class.name}: Query: #{query}, Category ID: #{category_id}, Status: #{status}"
+
+    return 'Missing required parameters' if query.blank?
+
+    articles = fetch_articles(query, category_id, status)
+
+    return 'No articles found' unless articles.exists?
+
+    total_count = articles.count
+    articles = articles.limit(100)
+
+    <<~RESPONSE
+      #{total_count > 100 ? "Found #{total_count} articles (showing first 100)" : "Total number of articles: #{total_count}"}
+      #{articles.map(&:to_llm_text).join("\n---\n")}
+    RESPONSE
+  end
+
+  def active?
+    user_has_permission('knowledge_base_manage')
+  end
+
+  private
+
+  def fetch_articles(query, category_id, status)
+    articles = Article.where(account_id: @assistant.account_id)
+    articles = articles.where('title ILIKE :query OR content ILIKE :query', query: "%#{query}%") if query.present?
+    articles = articles.where(category_id: category_id) if category_id.present?
+    articles = articles.where(status: status) if status.present?
+    articles
+  end
+
+  def properties
+    {
+      query: {
+        type: 'string',
+        description: 'Search articles by title or content (partial match)'
+      },
+      category_id: {
+        type: 'number',
+        description: 'Filter articles by category ID'
+      },
+      status: {
+        type: 'string',
+        enum: %w[draft published archived],
+        description: 'Filter articles by status'
+      }
+    }
+  end
+end
diff --git a/enterprise/app/services/captain/tools/copilot/search_contacts_service.rb b/enterprise/app/services/captain/tools/copilot/search_contacts_service.rb
new file mode 100644
index 000000000..557fc731a
--- /dev/null
+++ b/enterprise/app/services/captain/tools/copilot/search_contacts_service.rb
@@ -0,0 +1,61 @@
+class Captain::Tools::Copilot::SearchContactsService < Captain::Tools::BaseService
+  def name
+    'search_contacts'
+  end
+
+  def description
+    'Search contacts based on query parameters'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: properties,
+      required: []
+    }
+  end
+
+  def execute(arguments)
+    email = arguments['email']
+    phone_number = arguments['phone_number']
+    name = arguments['name']
+
+    Rails.logger.info "#{self.class.name} Email: #{email}, Phone Number: #{phone_number}, Name: #{name}"
+
+    contacts = Contact.where(account_id: @assistant.account_id)
+    contacts = contacts.where(email: email) if email.present?
+    contacts = contacts.where(phone_number: phone_number) if phone_number.present?
+    contacts = contacts.where('LOWER(name) ILIKE ?', "%#{name.downcase}%") if name.present?
+
+    return 'No contacts found' unless contacts.exists?
+
+    contacts = contacts.limit(100)
+
+    <<~RESPONSE
+      #{contacts.map(&:to_llm_text).join("\n---\n")}
+    RESPONSE
+  end
+
+  def active?
+    user_has_permission('contact_manage')
+  end
+
+  private
+
+  def properties
+    {
+      email: {
+        type: 'string',
+        description: 'Filter contacts by email'
+      },
+      phone_number: {
+        type: 'string',
+        description: 'Filter contacts by phone number'
+      },
+      name: {
+        type: 'string',
+        description: 'Filter contacts by name (partial match)'
+      }
+    }
+  end
+end
diff --git a/enterprise/app/services/captain/tools/copilot/search_conversations_service.rb b/enterprise/app/services/captain/tools/copilot/search_conversations_service.rb
new file mode 100644
index 000000000..f97604793
--- /dev/null
+++ b/enterprise/app/services/captain/tools/copilot/search_conversations_service.rb
@@ -0,0 +1,78 @@
+class Captain::Tools::Copilot::SearchConversationsService < Captain::Tools::BaseService
+  def name
+    'search_conversations'
+  end
+
+  def description
+    'Search conversations based on parameters'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: properties,
+      required: []
+    }
+  end
+
+  def execute(arguments)
+    status = arguments['status']
+    contact_id = arguments['contact_id']
+    priority = arguments['priority']
+
+    conversations = get_conversations(status, contact_id, priority)
+
+    return 'No conversations found' unless conversations.exists?
+
+    total_count = conversations.count
+    conversations = conversations.limit(100)
+
+    <<~RESPONSE
+      #{total_count > 100 ? "Found #{total_count} conversations (showing first 100)" : "Total number of conversations: #{total_count}"}
+      #{conversations.map { |conversation| conversation.to_llm_text(include_contact_details: true) }.join("\n---\n")}
+    RESPONSE
+  end
+
+  def active?
+    user_has_permission('conversation_manage') ||
+      user_has_permission('conversation_unassigned_manage') ||
+      user_has_permission('conversation_participating_manage')
+  end
+
+  private
+
+  def get_conversations(status, contact_id, priority)
+    conversations = permissible_conversations
+    conversations = conversations.where(contact_id: contact_id) if contact_id.present?
+    conversations = conversations.where(status: status) if status.present?
+    conversations = conversations.where(priority: priority) if priority.present?
+    conversations
+  end
+
+  def permissible_conversations
+    Conversations::PermissionFilterService.new(
+      @assistant.account.conversations,
+      @user,
+      @assistant.account
+    ).perform
+  end
+
+  def properties
+    {
+      contact_id: {
+        type: 'number',
+        description: 'Filter conversations by contact ID'
+      },
+      status: {
+        type: 'string',
+        enum: %w[open resolved pending snoozed],
+        description: 'Filter conversations by status'
+      },
+      priority: {
+        type: 'string',
+        enum: %w[low medium high urgent],
+        description: 'Filter conversations by priority'
+      }
+    }
+  end
+end
diff --git a/enterprise/app/services/captain/tools/copilot/search_linear_issues_service.rb b/enterprise/app/services/captain/tools/copilot/search_linear_issues_service.rb
new file mode 100644
index 000000000..599fc7de9
--- /dev/null
+++ b/enterprise/app/services/captain/tools/copilot/search_linear_issues_service.rb
@@ -0,0 +1,77 @@
+class Captain::Tools::Copilot::SearchLinearIssuesService < Captain::Tools::BaseService
+  def name
+    'search_linear_issues'
+  end
+
+  def description
+    'Search Linear issues based on a search term'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: {
+        term: {
+          type: 'string',
+          description: 'The search term to find Linear issues'
+        }
+      },
+      required: %w[term]
+    }
+  end
+
+  def execute(arguments)
+    return 'Linear integration is not enabled' unless active?
+
+    term = arguments['term']
+
+    Rails.logger.info "#{self.class.name}: Service called with the search term #{term}"
+
+    return 'Missing required parameters' if term.blank?
+
+    linear_service = Integrations::Linear::ProcessorService.new(account: @assistant.account)
+    result = linear_service.search_issue(term)
+
+    return result[:error] if result[:error]
+
+    issues = result[:data]
+    return 'No issues found, I should try another similar search term' if issues.blank?
+
+    total_count = issues.length
+
+    <<~RESPONSE
+      Total number of issues: #{total_count}
+      #{issues.map { |issue| format_issue(issue) }.join("\n---\n")}
+    RESPONSE
+  end
+
+  def active?
+    @assistant.account.hooks.find_by(app_id: 'linear').present?
+  end
+
+  private
+
+  def format_issue(issue)
+    <<~ISSUE
+      Title: #{issue['title']}
+      ID: #{issue['id']}
+      State: #{issue['state']['name']}
+      Priority: #{format_priority(issue['priority'])}
+      #{issue['assignee'] ? "Assignee: #{issue['assignee']['name']}" : 'Assignee: Unassigned'}
+      #{issue['description'].present? ? "\nDescription: #{issue['description']}" : ''}
+    ISSUE
+  end
+
+  def format_priority(priority)
+    return 'No priority' if priority.nil?
+
+    case priority
+    when 0 then 'No priority'
+    when 1 then 'Urgent'
+    when 2 then 'High'
+    when 3 then 'Medium'
+    when 4 then 'Low'
+    else 'Unknown'
+    end
+  end
+end
diff --git a/enterprise/app/services/captain/tools/search_documentation_service.rb b/enterprise/app/services/captain/tools/search_documentation_service.rb
new file mode 100644
index 000000000..672baf24a
--- /dev/null
+++ b/enterprise/app/services/captain/tools/search_documentation_service.rb
@@ -0,0 +1,49 @@
+class Captain::Tools::SearchDocumentationService < Captain::Tools::BaseService
+  def name
+    'search_documentation'
+  end
+
+  def description
+    'Search and retrieve documentation from knowledge base'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: {
+        search_query: {
+          type: 'string',
+          description: 'The search query to look up in the documentation.'
+        }
+      },
+      required: ['search_query']
+    }
+  end
+
+  def execute(arguments)
+    query = arguments['search_query']
+    Rails.logger.info { "#{self.class.name}: #{query}" }
+
+    responses = assistant.responses.approved.search(query)
+
+    return 'No FAQs found for the given query' if responses.empty?
+
+    responses.map { |response| format_response(response) }.join
+  end
+
+  private
+
+  def format_response(response)
+    formatted_response = "
+        Question: #{response.question}
+        Answer: #{response.answer}
+        "
+    if response.documentable.present? && response.documentable.try(:external_link)
+      formatted_response += "
+          Source: #{response.documentable.external_link}
+          "
+    end
+
+    formatted_response
+  end
+end
diff --git a/enterprise/app/services/enterprise/conversations/permission_filter_service.rb b/enterprise/app/services/enterprise/conversations/permission_filter_service.rb
index 5da65ffa6..f55265a90 100644
--- a/enterprise/app/services/enterprise/conversations/permission_filter_service.rb
+++ b/enterprise/app/services/enterprise/conversations/permission_filter_service.rb
@@ -1,36 +1,37 @@
 module Enterprise::Conversations::PermissionFilterService
   def perform
-    account_user = AccountUser.find_by(account_id: account.id, user_id: user.id)
-    permissions = account_user&.permissions || []
-    user_role = account_user&.role
+    return filter_by_permissions(permissions) if user_has_custom_role?
 
-    # Skip filtering for administrators
-    return conversations if user_role == 'administrator'
-    # Skip filtering for regular agents (without custom roles/permissions)
-    return conversations if user_role == 'agent' && account_user&.custom_role_id.nil?
-
-    filter_by_permissions(permissions)
+    super
   end
 
   private
 
+  def user_has_custom_role?
+    user_role == 'agent' && account_user&.custom_role_id.present?
+  end
+
+  def permissions
+    account_user&.permissions || []
+  end
+
   def filter_by_permissions(permissions)
     # Permission-based filtering with hierarchy
     # conversation_manage > conversation_unassigned_manage > conversation_participating_manage
     if permissions.include?('conversation_manage')
-      conversations
+      accessible_conversations
     elsif permissions.include?('conversation_unassigned_manage')
       filter_unassigned_and_mine
     elsif permissions.include?('conversation_participating_manage')
-      conversations.assigned_to(user)
+      accessible_conversations.assigned_to(user)
     else
       Conversation.none
     end
   end
 
   def filter_unassigned_and_mine
-    mine = conversations.assigned_to(user)
-    unassigned = conversations.unassigned
+    mine = accessible_conversations.assigned_to(user)
+    unassigned = accessible_conversations.unassigned
 
     Conversation.from("(#{mine.to_sql} UNION #{unassigned.to_sql}) as conversations")
                 .where(account_id: account.id)
diff --git a/lib/linear.rb b/lib/linear.rb
index 9a998c34a..8bf967fc3 100644
--- a/lib/linear.rb
+++ b/lib/linear.rb
@@ -57,7 +57,8 @@ class Linear
       assigneeId: params[:assignee_id],
       priority: params[:priority],
       labelIds: params[:label_ids],
-      projectId: params[:project_id]
+      projectId: params[:project_id],
+      stateId: params[:state_id]
     }.compact
     mutation = Linear::Mutations.issue_create(variables)
     response = post({ query: mutation })
diff --git a/package.json b/package.json
index 88c775f28..90b7708f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",
diff --git a/spec/builders/account_builder_spec.rb b/spec/builders/account_builder_spec.rb
new file mode 100644
index 000000000..86cb4cf73
--- /dev/null
+++ b/spec/builders/account_builder_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountBuilder do
+  let(:email) { 'user@example.com' }
+  let(:user_password) { 'Password123!' }
+  let(:account_name) { 'Test Account' }
+  let(:user_full_name) { 'Test User' }
+  let(:validation_service) { instance_double(Account::SignUpEmailValidationService, perform: true) }
+  let(:account_builder) do
+    described_class.new(
+      account_name: account_name,
+      email: email,
+      user_full_name: user_full_name,
+      user_password: user_password,
+      confirmed: true
+    )
+  end
+
+  # Mock the email validation service
+  before do
+    allow(Account::SignUpEmailValidationService).to receive(:new).with(email).and_return(validation_service)
+  end
+
+  describe '#perform' do
+    context 'when valid params are passed' do
+      it 'creates a new account with correct name' do
+        _user, account = account_builder.perform
+        expect(account).to be_an(Account)
+        expect(account.name).to eq(account_name)
+      end
+
+      it 'creates a new confirmed user with correct details' do
+        user, _account = account_builder.perform
+        expect(user).to be_a(User)
+        expect(user.email).to eq(email)
+        expect(user.name).to eq(user_full_name)
+        expect(user.confirmed?).to be(true)
+      end
+
+      it 'links user to account as administrator' do
+        user, account = account_builder.perform
+        expect(user.account_users.first.role).to eq('administrator')
+        expect(user.accounts.first).to eq(account)
+      end
+
+      it 'increments the counts of models' do
+        expect do
+          account_builder.perform
+        end.to change(Account, :count).by(1)
+           .and change(User, :count).by(1)
+           .and change(AccountUser, :count).by(1)
+      end
+    end
+  end
+end
diff --git a/spec/builders/messages/instagram/message_builder_spec.rb b/spec/builders/messages/instagram/message_builder_spec.rb
index 0dbe87afa..8e863823a 100644
--- a/spec/builders/messages/instagram/message_builder_spec.rb
+++ b/spec/builders/messages/instagram/message_builder_spec.rb
@@ -79,6 +79,18 @@ describe Messages::Instagram::MessageBuilder do
       expect(instagram_inbox.messages.count).to be 1
     end
 
+    it 'discards duplicate messages from webhook events with the same message_id' do
+      messaging = dm_params[:entry][0]['messaging'][0]
+      described_class.new(messaging, instagram_inbox).perform
+
+      initial_message_count = instagram_inbox.messages.count
+      expect(initial_message_count).to be 1
+
+      described_class.new(messaging, instagram_inbox).perform
+
+      expect(instagram_inbox.messages.count).to eq initial_message_count
+    end
+
     it 'creates message for shared reel' do
       messaging = shared_reel_params[:entry][0]['messaging'][0]
       described_class.new(messaging, instagram_inbox).perform
@@ -151,11 +163,15 @@ describe Messages::Instagram::MessageBuilder do
     end
 
     it 'does not create message for unsupported file type' do
+      conversation
+
+      # try to create a message with unsupported file type
       story_mention_params[:entry][0][:messaging][0]['message']['attachments'][0]['type'] = 'unsupported_type'
       messaging = story_mention_params[:entry][0][:messaging][0]
 
       described_class.new(messaging, instagram_inbox, outgoing_echo: false).perform
 
+      # Conversation should exist but no new message should be created
       expect(instagram_inbox.conversations.count).to be 1
       expect(instagram_inbox.messages.count).to be 0
     end
diff --git a/spec/builders/messages/instagram/messenger/message_builder_spec.rb b/spec/builders/messages/instagram/messenger/message_builder_spec.rb
index 78c97b071..03194673a 100644
--- a/spec/builders/messages/instagram/messenger/message_builder_spec.rb
+++ b/spec/builders/messages/instagram/messenger/message_builder_spec.rb
@@ -189,19 +189,22 @@ describe Messages::Instagram::Messenger::MessageBuilder do
           profile_pic: 'https://chatwoot-assets.local/sample.png'
         }.with_indifferent_access
       )
+
+      conversation
+
+      # create a message with unsupported file type
       story_mention_params[:entry][0][:messaging][0]['message']['attachments'][0]['type'] = 'unsupported_type'
       messaging = story_mention_params[:entry][0][:messaging][0]
-      contact_inbox
+
       described_class.new(messaging, instagram_messenger_inbox, outgoing_echo: false).perform
 
       instagram_messenger_inbox.reload
 
-      # we would have contact created but message and attachments won't be created
+      # Conversation should exist but no new message should be created
       expect(instagram_messenger_inbox.conversations.count).to be 1
       expect(instagram_messenger_inbox.messages.count).to be 0
 
       contact = instagram_messenger_channel.inbox.contacts.first
-
       expect(contact.name).to eq('Jane Dae')
     end
   end
diff --git a/spec/builders/v2/reports/conversations/report_builder_spec.rb b/spec/builders/v2/reports/conversations/report_builder_spec.rb
index d3cde98e6..db7a0ac45 100644
--- a/spec/builders/v2/reports/conversations/report_builder_spec.rb
+++ b/spec/builders/v2/reports/conversations/report_builder_spec.rb
@@ -33,12 +33,12 @@ describe V2::Reports::Conversations::ReportBuilder do
   end
 
   describe '#timeseries' do
-    include_examples 'valid metric handler', 'avg_first_response_time', :timeseries, V2::Reports::Timeseries::AverageReportBuilder
-    include_examples 'valid metric handler', 'conversations_count', :timeseries, V2::Reports::Timeseries::CountReportBuilder
+    it_behaves_like 'valid metric handler', 'avg_first_response_time', :timeseries, V2::Reports::Timeseries::AverageReportBuilder
+    it_behaves_like 'valid metric handler', 'conversations_count', :timeseries, V2::Reports::Timeseries::CountReportBuilder
   end
 
   describe '#aggregate_value' do
-    include_examples 'valid metric handler', 'avg_first_response_time', :aggregate_value, V2::Reports::Timeseries::AverageReportBuilder
-    include_examples 'valid metric handler', 'conversations_count', :aggregate_value, V2::Reports::Timeseries::CountReportBuilder
+    it_behaves_like 'valid metric handler', 'avg_first_response_time', :aggregate_value, V2::Reports::Timeseries::AverageReportBuilder
+    it_behaves_like 'valid metric handler', 'conversations_count', :aggregate_value, V2::Reports::Timeseries::CountReportBuilder
   end
 end
diff --git a/spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb
index b1341e65e..0f27e2bd2 100644
--- a/spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb
@@ -100,6 +100,7 @@ RSpec.describe 'Linear Integration API', type: :request do
         description: 'This is a sample issue.',
         assignee_id: 'user1',
         priority: 'high',
+        state_id: 'state1',
         label_ids: ['label1']
       }
     end
diff --git a/spec/controllers/devise/omniauth_callbacks_controller_spec.rb b/spec/controllers/devise/omniauth_callbacks_controller_spec.rb
index 3513b9c34..0a9c82f53 100644
--- a/spec/controllers/devise/omniauth_callbacks_controller_spec.rb
+++ b/spec/controllers/devise/omniauth_callbacks_controller_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
 RSpec.describe 'DeviseOverrides::OmniauthCallbacksController', type: :request do
   let(:account_builder) { double }
   let(:user_double) { object_double(:user) }
+  let(:email_validation_service) { instance_double(Account::SignUpEmailValidationService) }
 
   def set_omniauth_config(for_email = 'test@example.com')
     OmniAuth.config.test_mode = true
@@ -17,13 +18,18 @@ RSpec.describe 'DeviseOverrides::OmniauthCallbacksController', type: :request do
     )
   end
 
+  before do
+    allow(Account::SignUpEmailValidationService).to receive(:new).and_return(email_validation_service)
+  end
+
   describe '#omniauth_sucess' do
     it 'allows signup' do
-      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true', FRONTEND_URL: 'http://www.example.com' do
         set_omniauth_config('test_not_preset@example.com')
         allow(AccountBuilder).to receive(:new).and_return(account_builder)
         allow(account_builder).to receive(:perform).and_return(user_double)
         allow(Avatar::AvatarFromUrlJob).to receive(:perform_later).and_return(true)
+        allow(email_validation_service).to receive(:perform).and_return(true)
 
         get '/omniauth/google_oauth2/callback'
 
@@ -43,8 +49,10 @@ RSpec.describe 'DeviseOverrides::OmniauthCallbacksController', type: :request do
     end
 
     it 'blocks personal accounts signup' do
-      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true', FRONTEND_URL: 'http://www.example.com' do
         set_omniauth_config('personal@gmail.com')
+        allow(email_validation_service).to receive(:perform).and_raise(CustomExceptions::Account::InvalidEmail.new({ valid: false, disposable: nil }))
+
         get '/omniauth/google_oauth2/callback'
 
         # expect a 302 redirect to auth/google_oauth2/callback
@@ -57,10 +65,13 @@ RSpec.describe 'DeviseOverrides::OmniauthCallbacksController', type: :request do
     end
 
     it 'blocks personal accounts signup with different Gmail case variations' do
-      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true', FRONTEND_URL: 'http://www.example.com' do
         # Test different case variations of Gmail
         ['personal@Gmail.com', 'personal@GMAIL.com', 'personal@Gmail.COM'].each do |email|
           set_omniauth_config(email)
+          allow(email_validation_service).to receive(:perform).and_raise(CustomExceptions::Account::InvalidEmail.new({ valid: false,
+                                                                                                                       disposable: nil }))
+
           get '/omniauth/google_oauth2/callback'
 
           # expect a 302 redirect to auth/google_oauth2/callback
@@ -76,8 +87,10 @@ RSpec.describe 'DeviseOverrides::OmniauthCallbacksController', type: :request do
     # This test does not affect line coverage, but it is important to ensure that the logic
     # does not allow any signup if the ENV explicitly disables it
     it 'blocks signup if ENV disabled' do
-      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'false' do
+      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'false', FRONTEND_URL: 'http://www.example.com' do
         set_omniauth_config('does-not-exist-for-sure@example.com')
+        allow(email_validation_service).to receive(:perform).and_return(true)
+
         get '/omniauth/google_oauth2/callback'
 
         # expect a 302 redirect to auth/google_oauth2/callback
@@ -90,38 +103,42 @@ RSpec.describe 'DeviseOverrides::OmniauthCallbacksController', type: :request do
     end
 
     it 'allows login' do
-      create(:user, email: 'test@example.com')
-      set_omniauth_config('test@example.com')
+      with_modified_env FRONTEND_URL: 'http://www.example.com' do
+        create(:user, email: 'test@example.com')
+        set_omniauth_config('test@example.com')
 
-      get '/omniauth/google_oauth2/callback'
-      # expect a 302 redirect to auth/google_oauth2/callback
-      expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
+        get '/omniauth/google_oauth2/callback'
+        # expect a 302 redirect to auth/google_oauth2/callback
+        expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
 
-      follow_redirect!
-      expect(response).to redirect_to(%r{/app/login\?email=.+&sso_auth_token=.+$})
+        follow_redirect!
+        expect(response).to redirect_to(%r{/app/login\?email=.+&sso_auth_token=.+$})
 
-      # expect app/login page to respond with 200 and render
-      follow_redirect!
-      expect(response).to have_http_status(:ok)
+        # expect app/login page to respond with 200 and render
+        follow_redirect!
+        expect(response).to have_http_status(:ok)
+      end
     end
 
     # from a line coverage point of view this may seem redundant
     # but to ensure that the logic allows for existing users even if they have a gmail account
     # we need to test this explicitly
     it 'allows personal account login' do
-      create(:user, email: 'personal-existing@gmail.com')
-      set_omniauth_config('personal-existing@gmail.com')
+      with_modified_env FRONTEND_URL: 'http://www.example.com' do
+        create(:user, email: 'personal-existing@gmail.com')
+        set_omniauth_config('personal-existing@gmail.com')
 
-      get '/omniauth/google_oauth2/callback'
-      # expect a 302 redirect to auth/google_oauth2/callback
-      expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
+        get '/omniauth/google_oauth2/callback'
+        # expect a 302 redirect to auth/google_oauth2/callback
+        expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
 
-      follow_redirect!
-      expect(response).to redirect_to(%r{/app/login\?email=.+&sso_auth_token=.+$})
+        follow_redirect!
+        expect(response).to redirect_to(%r{/app/login\?email=.+&sso_auth_token=.+$})
 
-      # expect app/login page to respond with 200 and render
-      follow_redirect!
-      expect(response).to have_http_status(:ok)
+        # expect app/login page to respond with 200 and render
+        follow_redirect!
+        expect(response).to have_http_status(:ok)
+      end
     end
   end
 end
diff --git a/spec/controllers/platform/api/v1/users_controller_spec.rb b/spec/controllers/platform/api/v1/users_controller_spec.rb
index 895f30b29..c73a03654 100644
--- a/spec/controllers/platform/api/v1/users_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/users_controller_spec.rb
@@ -76,6 +76,54 @@ RSpec.describe 'Platform Users API', type: :request do
     end
   end
 
+  describe 'POST /platform/api/v1/users/{user_id}/token' do
+    context 'when it is an unauthenticated platform app' do
+      it 'returns unauthorized' do
+        post "/platform/api/v1/users/#{user.id}/token"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an invalid platform app token' do
+      it 'returns unauthorized' do
+        post "/platform/api/v1/users/#{user.id}/token", headers: { api_access_token: 'invalid' }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated platform app' do
+      let(:platform_app) { create(:platform_app) }
+
+      it 'returns unauthorized when its not a permissible object' do
+        post "/platform/api/v1/users/#{user.id}/token", headers: { api_access_token: platform_app.access_token.token }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns access token for the user with expiry and user info' do
+        create(:platform_app_permissible, platform_app: platform_app, permissible: user)
+
+        post "/platform/api/v1/users/#{user.id}/token",
+             headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        expect(response).to have_http_status(:success)
+        data = response.parsed_body
+
+        # Check access token and expiry
+        expect(data['access_token']).to eq(user.access_token.token)
+        expect(data['expiry']).to be_nil
+
+        # Check user info
+        expect(data['user']).to include(
+          'id' => user.id,
+          'name' => user.name,
+          'display_name' => user.display_name,
+          'email' => user.email,
+          'pubsub_token' => user.pubsub_token
+        )
+      end
+    end
+  end
+
   describe 'POST /platform/api/v1/users/' do
     context 'when it is an unauthenticated platform app' do
       it 'returns unauthorized' do
diff --git a/spec/enterprise/services/captain/tool_registry_service_spec.rb b/spec/enterprise/services/captain/tool_registry_service_spec.rb
new file mode 100644
index 000000000..c8d97fe3a
--- /dev/null
+++ b/spec/enterprise/services/captain/tool_registry_service_spec.rb
@@ -0,0 +1,112 @@
+require 'rails_helper'
+
+# Test tool implementation
+class TestTool < Captain::Tools::BaseService
+  attr_accessor :tool_active
+
+  def initialize(assistant, user: nil)
+    super
+    @tool_active = true
+  end
+
+  def name
+    'test_tool'
+  end
+
+  def description
+    'A test tool for specs'
+  end
+
+  def parameters
+    {
+      type: 'object',
+      properties: {
+        test_param: {
+          type: 'string'
+        }
+      }
+    }
+  end
+
+  def execute(*args)
+    args
+  end
+
+  def active?
+    @tool_active
+  end
+end
+
+RSpec.describe Captain::ToolRegistryService do
+  let(:assistant) { create(:captain_assistant) }
+  let(:service) { described_class.new(assistant) }
+
+  describe '#initialize' do
+    it 'initializes with empty tools and registered_tools' do
+      expect(service.tools).to be_empty
+      expect(service.registered_tools).to be_empty
+    end
+  end
+
+  describe '#register_tool' do
+    let(:tool_class) { TestTool }
+
+    context 'when tool is active' do
+      it 'registers a new tool' do
+        service.register_tool(tool_class)
+        expect(service.tools['test_tool']).to be_a(TestTool)
+        expect(service.registered_tools).to include(
+          {
+            type: 'function',
+            function: {
+              name: 'test_tool',
+              description: 'A test tool for specs',
+              parameters: {
+                type: 'object',
+                properties: {
+                  test_param: {
+                    type: 'string'
+                  }
+                }
+              }
+            }
+          }
+        )
+      end
+    end
+
+    context 'when tool is inactive' do
+      it 'does not register the tool' do
+        tool = tool_class.new(assistant)
+        tool.tool_active = false
+        allow(tool_class).to receive(:new).and_return(tool)
+
+        service.register_tool(tool_class)
+
+        expect(service.tools['test_tool']).to be_nil
+        expect(service.registered_tools).to be_empty
+      end
+    end
+  end
+
+  describe 'method_missing' do
+    let(:tool_class) { TestTool }
+
+    before do
+      service.register_tool(tool_class)
+    end
+
+    context 'when method corresponds to a registered tool' do
+      it 'executes the tool with given arguments' do
+        result = service.test_tool(test_param: 'arg1')
+        expect(result).to eq([{ test_param: 'arg1' }])
+      end
+    end
+
+    context 'when method does not correspond to a registered tool' do
+      it 'raises NoMethodError' do
+        expect { service.unknown_tool }.to raise_error(NoMethodError)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/copilot/get_article_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/get_article_service_spec.rb
new file mode 100644
index 000000000..72f4e1cb4
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/copilot/get_article_service_spec.rb
@@ -0,0 +1,112 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::Copilot::GetArticleService do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:service) { described_class.new(assistant, user: user) }
+
+  describe '#name' do
+    it 'returns the correct service name' do
+      expect(service.name).to eq('get_article')
+    end
+  end
+
+  describe '#description' do
+    it 'returns the service description' do
+      expect(service.description).to eq('Get details of an article including its content and metadata')
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns the expected parameter schema' do
+      expect(service.parameters).to eq(
+        {
+          type: 'object',
+          properties: {
+            article_id: {
+              type: 'number',
+              description: 'The ID of the article to retrieve'
+            }
+          },
+          required: %w[article_id]
+        }
+      )
+    end
+  end
+
+  describe '#active?' do
+    context 'when user is an admin' do
+      let(:user) { create(:user, :administrator, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role with knowledge_base_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['knowledge_base_manage']) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role without knowledge_base_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: []) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns false' do
+        expect(service.active?).to be false
+      end
+    end
+  end
+
+  describe '#execute' do
+    context 'when article_id is blank' do
+      it 'returns error message' do
+        expect(service.execute({})).to eq('Missing required parameters')
+      end
+    end
+
+    context 'when article is not found' do
+      it 'returns not found message' do
+        expect(service.execute({ 'article_id' => 999 })).to eq('Article not found')
+      end
+    end
+
+    context 'when article exists' do
+      let(:portal) { create(:portal, account: account) }
+      let(:article) { create(:article, account: account, portal: portal, author: user, title: 'Test Article', content: 'Content') }
+
+      it 'returns the article in llm text format' do
+        result = service.execute({ 'article_id' => article.id })
+        expect(result).to eq(article.to_llm_text)
+      end
+
+      context 'when article belongs to different account' do
+        let(:other_account) { create(:account) }
+        let(:other_portal) { create(:portal, account: other_account) }
+        let(:other_article) { create(:article, account: other_account, portal: other_portal, author: user, title: 'Other Article') }
+
+        it 'returns not found message' do
+          expect(service.execute({ 'article_id' => other_article.id })).to eq('Article not found')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/copilot/get_contact_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/get_contact_service_spec.rb
new file mode 100644
index 000000000..de319bfa1
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/copilot/get_contact_service_spec.rb
@@ -0,0 +1,110 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::Copilot::GetContactService do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:service) { described_class.new(assistant, user: user) }
+
+  describe '#name' do
+    it 'returns the correct service name' do
+      expect(service.name).to eq('get_contact')
+    end
+  end
+
+  describe '#description' do
+    it 'returns the service description' do
+      expect(service.description).to eq('Get details of a contact including their profile information')
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns the expected parameter schema' do
+      expect(service.parameters).to eq(
+        {
+          type: 'object',
+          properties: {
+            contact_id: {
+              type: 'number',
+              description: 'The ID of the contact to retrieve'
+            }
+          },
+          required: %w[contact_id]
+        }
+      )
+    end
+  end
+
+  describe '#active?' do
+    context 'when user is an admin' do
+      let(:user) { create(:user, :administrator, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role with contact_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['contact_manage']) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role without contact_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: []) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns false' do
+        expect(service.active?).to be false
+      end
+    end
+  end
+
+  describe '#execute' do
+    context 'when contact_id is blank' do
+      it 'returns error message' do
+        expect(service.execute({})).to eq('Missing required parameters')
+      end
+    end
+
+    context 'when contact is not found' do
+      it 'returns not found message' do
+        expect(service.execute({ 'contact_id' => 999 })).to eq('Contact not found')
+      end
+    end
+
+    context 'when contact exists' do
+      let(:contact) { create(:contact, account: account) }
+
+      it 'returns the contact in llm text format' do
+        result = service.execute({ 'contact_id' => contact.id })
+        expect(result).to eq(contact.to_llm_text)
+      end
+
+      context 'when contact belongs to different account' do
+        let(:other_account) { create(:account) }
+        let(:other_contact) { create(:contact, account: other_account) }
+
+        it 'returns not found message' do
+          expect(service.execute({ 'contact_id' => other_contact.id })).to eq('Contact not found')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/copilot/get_conversation_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/get_conversation_service_spec.rb
new file mode 100644
index 000000000..4d7f1adc7
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/copilot/get_conversation_service_spec.rb
@@ -0,0 +1,142 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::Copilot::GetConversationService do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:service) { described_class.new(assistant, user: user) }
+
+  describe '#name' do
+    it 'returns the correct service name' do
+      expect(service.name).to eq('get_conversation')
+    end
+  end
+
+  describe '#description' do
+    it 'returns the service description' do
+      expect(service.description).to eq('Get details of a conversation including messages and contact information')
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns the expected parameter schema' do
+      expect(service.parameters).to eq(
+        {
+          type: 'object',
+          properties: {
+            conversation_id: {
+              type: 'number',
+              description: 'The ID of the conversation to retrieve'
+            }
+          },
+          required: %w[conversation_id]
+        }
+      )
+    end
+  end
+
+  describe '#active?' do
+    context 'when user is an admin' do
+      let(:user) { create(:user, :administrator, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role with conversation_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['conversation_manage']) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role with conversation_unassigned_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['conversation_unassigned_manage']) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role with conversation_participating_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['conversation_participating_manage']) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role without any conversation permissions' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: []) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns false' do
+        expect(service.active?).to be false
+      end
+    end
+  end
+
+  describe '#execute' do
+    context 'when conversation_id is blank' do
+      it 'returns error message' do
+        expect(service.execute({})).to eq('Missing required parameters')
+      end
+    end
+
+    context 'when conversation is not found' do
+      it 'returns not found message' do
+        expect(service.execute({ 'conversation_id' => 999 })).to eq('Conversation not found')
+      end
+    end
+
+    context 'when conversation exists' do
+      let(:inbox) { create(:inbox, account: account) }
+      let(:conversation) { create(:conversation, account: account, inbox: inbox) }
+
+      it 'returns the conversation in llm text format' do
+        result = service.execute({ 'conversation_id' => conversation.display_id })
+        expect(result).to eq(conversation.to_llm_text)
+      end
+
+      context 'when conversation belongs to different account' do
+        let(:other_account) { create(:account) }
+        let(:other_inbox) { create(:inbox, account: other_account) }
+        let(:other_conversation) { create(:conversation, account: other_account, inbox: other_inbox) }
+
+        it 'returns not found message' do
+          expect(service.execute({ 'conversation_id' => other_conversation.display_id })).to eq('Conversation not found')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/copilot/search_articles_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/search_articles_service_spec.rb
new file mode 100644
index 000000000..e4504d7bd
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/copilot/search_articles_service_spec.rb
@@ -0,0 +1,167 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::Copilot::SearchArticlesService do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:service) { described_class.new(assistant, user: user) }
+
+  describe '#name' do
+    it 'returns the correct service name' do
+      expect(service.name).to eq('search_articles')
+    end
+  end
+
+  describe '#description' do
+    it 'returns the service description' do
+      expect(service.description).to eq('Search articles based on parameters')
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns the expected parameter schema' do
+      expect(service.parameters).to eq(
+        {
+          type: 'object',
+          properties: {
+            query: {
+              type: 'string',
+              description: 'Search articles by title or content (partial match)'
+            },
+            category_id: {
+              type: 'number',
+              description: 'Filter articles by category ID'
+            },
+            status: {
+              type: 'string',
+              enum: %w[draft published archived],
+              description: 'Filter articles by status'
+            }
+          },
+          required: ['query']
+        }
+      )
+    end
+  end
+
+  describe '#active?' do
+    context 'when user is an admin' do
+      let(:user) { create(:user, :administrator, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user is an agent' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role with knowledge_base_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['knowledge_base_manage']) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has custom role without knowledge_base_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: []) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns false' do
+        expect(service.active?).to be false
+      end
+    end
+  end
+
+  describe '#execute' do
+    context 'when query is blank' do
+      it 'returns error message' do
+        expect(service.execute({})).to eq('Missing required parameters')
+      end
+    end
+
+    context 'when no articles are found' do
+      before do
+        allow(Article).to receive(:where).and_return(Article.none)
+      end
+
+      it 'returns no articles found message' do
+        expect(service.execute({ 'query' => 'test' })).to eq('No articles found')
+      end
+    end
+
+    context 'when articles are found' do
+      let(:portal) { create(:portal, account: account) }
+      let(:article1) { create(:article, account: account, portal: portal, author: user, title: 'Test Article 1', content: 'Content 1') }
+      let(:article2) { create(:article, account: account, portal: portal, author: user, title: 'Test Article 2', content: 'Content 2') }
+
+      before do
+        article1
+        article2
+      end
+
+      it 'returns formatted articles with count' do
+        result = service.execute({ 'query' => 'Test' })
+        expect(result).to include('Total number of articles: 2')
+        expect(result).to include(article1.to_llm_text)
+        expect(result).to include(article2.to_llm_text)
+      end
+
+      context 'when filtered by category' do
+        let(:category) { create(:category, slug: 'test-category', portal: portal, account: account) }
+        let(:article3) { create(:article, account: account, portal: portal, author: user, category: category, title: 'Test Article 3') }
+
+        before do
+          article3
+        end
+
+        it 'returns only articles from the specified category' do
+          result = service.execute({ 'query' => 'Test', 'category_id' => category.id })
+          expect(result).to include('Total number of articles: 1')
+          expect(result).to include(article3.to_llm_text)
+          expect(result).not_to include(article1.to_llm_text)
+          expect(result).not_to include(article2.to_llm_text)
+        end
+      end
+
+      context 'when filtered by status' do
+        let(:article3) do
+          create(:article, account: account, portal: portal, author: user, title: 'Test Article 3', status: 'published')
+        end
+        let(:article4) { create(:article, account: account, portal: portal, author: user, title: 'Test Article 4', status: 'draft') }
+
+        before do
+          article3
+          article4
+        end
+
+        it 'returns only articles with the specified status' do
+          result = service.execute({ 'query' => 'Test', 'status' => 'published' })
+          expect(result).to include(article3.to_llm_text)
+          expect(result).not_to include(article4.to_llm_text)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/copilot/search_contacts_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/search_contacts_service_spec.rb
new file mode 100644
index 000000000..f54b2eddf
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/copilot/search_contacts_service_spec.rb
@@ -0,0 +1,113 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::Copilot::SearchContactsService do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:service) { described_class.new(assistant, user: user) }
+
+  describe '#name' do
+    it 'returns the correct service name' do
+      expect(service.name).to eq('search_contacts')
+    end
+  end
+
+  describe '#description' do
+    it 'returns the service description' do
+      expect(service.description).to eq('Search contacts based on query parameters')
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns the expected parameter schema' do
+      expect(service.parameters).to eq(
+        {
+          type: 'object',
+          properties: {
+            email: {
+              type: 'string',
+              description: 'Filter contacts by email'
+            },
+            phone_number: {
+              type: 'string',
+              description: 'Filter contacts by phone number'
+            },
+            name: {
+              type: 'string',
+              description: 'Filter contacts by name (partial match)'
+            }
+          },
+          required: []
+        }
+      )
+    end
+  end
+
+  describe '#active?' do
+    context 'when user has contact_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['contact_manage']) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user does not have contact_manage permission' do
+      let(:user) { create(:user, account: account) }
+      let(:assistant) { create(:captain_assistant, account: account) }
+      let(:custom_role) { create(:custom_role, account: account, permissions: []) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns false' do
+        expect(service.active?).to be false
+      end
+    end
+  end
+
+  describe '#execute' do
+    context 'when contacts are found' do
+      let(:contact1) { create(:contact, account: account, email: 'test1@example.com', name: 'Test Contact 1', phone_number: '+1234567890') }
+      let(:contact2) { create(:contact, account: account, email: 'test2@example.com', name: 'Test Contact 2', phone_number: '+1234567891') }
+
+      before do
+        contact1
+        contact2
+      end
+
+      it 'returns contacts when filtered by email' do
+        result = service.execute({ 'email' => 'test1@example.com' })
+        expect(result).to include(contact1.to_llm_text)
+        expect(result).not_to include(contact2.to_llm_text)
+      end
+
+      it 'returns contacts when filtered by phone number' do
+        result = service.execute({ 'phone_number' => '+1234567890' })
+        expect(result).to include(contact1.to_llm_text)
+        expect(result).not_to include(contact2.to_llm_text)
+      end
+
+      it 'returns contacts when filtered by name' do
+        result = service.execute({ 'name' => 'Contact 1' })
+        expect(result).to include(contact1.to_llm_text)
+        expect(result).not_to include(contact2.to_llm_text)
+      end
+
+      it 'returns all matching contacts when no filters are provided' do
+        result = service.execute({})
+        expect(result).to include(contact1.to_llm_text)
+        expect(result).to include(contact2.to_llm_text)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/copilot/search_conversations_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/search_conversations_service_spec.rb
new file mode 100644
index 000000000..ab0865bc2
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/copilot/search_conversations_service_spec.rb
@@ -0,0 +1,125 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::Copilot::SearchConversationsService do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, role: 'administrator', account: account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:service) { described_class.new(assistant, user: user) }
+
+  describe '#name' do
+    it 'returns the correct service name' do
+      expect(service.name).to eq('search_conversations')
+    end
+  end
+
+  describe '#description' do
+    it 'returns the service description' do
+      expect(service.description).to eq('Search conversations based on parameters')
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns the correct parameter schema' do
+      params = service.parameters
+      expect(params[:type]).to eq('object')
+      expect(params[:properties]).to include(:contact_id, :status, :priority)
+    end
+  end
+
+  describe '#active?' do
+    context 'when user has conversation_manage permission' do
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['conversation_manage']) }
+      let(:user) { create(:user, account: account) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has conversation_unassigned_manage permission' do
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['conversation_unassigned_manage']) }
+      let(:user) { create(:user, account: account) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has conversation_participating_manage permission' do
+      let(:custom_role) { create(:custom_role, account: account, permissions: ['conversation_participating_manage']) }
+      let(:user) { create(:user, account: account) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when user has no relevant conversation permissions' do
+      let(:custom_role) { create(:custom_role, account: account, permissions: []) }
+      let(:user) { create(:user, account: account) }
+
+      before do
+        account_user = AccountUser.find_by(user: user, account: account)
+        account_user.update(role: :agent, custom_role: custom_role)
+      end
+
+      it 'returns false' do
+        expect(service.active?).to be false
+      end
+    end
+  end
+
+  describe '#execute' do
+    let(:contact) { create(:contact, account: account) }
+    let!(:open_conversation) { create(:conversation, account: account, contact: contact, status: 'open', priority: 'high') }
+    let!(:resolved_conversation) { create(:conversation, account: account, status: 'resolved', priority: 'low') }
+
+    it 'returns all conversations when no filters are applied' do
+      result = service.execute({})
+      expect(result).to include('Total number of conversations: 2')
+      expect(result).to include(open_conversation.to_llm_text(include_contact_details: true))
+      expect(result).to include(resolved_conversation.to_llm_text(include_contact_details: true))
+    end
+
+    it 'filters conversations by status' do
+      result = service.execute({ 'status' => 'open' })
+      expect(result).to include('Total number of conversations: 1')
+      expect(result).to include(open_conversation.to_llm_text(include_contact_details: true))
+      expect(result).not_to include(resolved_conversation.to_llm_text(include_contact_details: true))
+    end
+
+    it 'filters conversations by contact_id' do
+      result = service.execute({ 'contact_id' => contact.id })
+      expect(result).to include('Total number of conversations: 1')
+      expect(result).to include(open_conversation.to_llm_text(include_contact_details: true))
+      expect(result).not_to include(resolved_conversation.to_llm_text(include_contact_details: true))
+    end
+
+    it 'filters conversations by priority' do
+      result = service.execute({ 'priority' => 'high' })
+      expect(result).to include('Total number of conversations: 1')
+      expect(result).to include(open_conversation.to_llm_text(include_contact_details: true))
+      expect(result).not_to include(resolved_conversation.to_llm_text(include_contact_details: true))
+    end
+
+    it 'returns appropriate message when no conversations are found' do
+      result = service.execute({ 'status' => 'snoozed' })
+      expect(result).to eq('No conversations found')
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/copilot/search_linear_issues_service_spec.rb b/spec/enterprise/services/captain/tools/copilot/search_linear_issues_service_spec.rb
new file mode 100644
index 000000000..f4a5225b1
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/copilot/search_linear_issues_service_spec.rb
@@ -0,0 +1,125 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::Copilot::SearchLinearIssuesService do
+  let(:account) { create(:account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:service) { described_class.new(assistant) }
+
+  describe '#name' do
+    it 'returns the correct service name' do
+      expect(service.name).to eq('search_linear_issues')
+    end
+  end
+
+  describe '#description' do
+    it 'returns the service description' do
+      expect(service.description).to eq('Search Linear issues based on a search term')
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns the expected parameter schema' do
+      expect(service.parameters).to eq(
+        {
+          type: 'object',
+          properties: {
+            term: {
+              type: 'string',
+              description: 'The search term to find Linear issues'
+            }
+          },
+          required: %w[term]
+        }
+      )
+    end
+  end
+
+  describe '#active?' do
+    context 'when Linear integration is enabled' do
+      before do
+        create(:integrations_hook, :linear, account: account)
+      end
+
+      it 'returns true' do
+        expect(service.active?).to be true
+      end
+    end
+
+    context 'when Linear integration is not enabled' do
+      it 'returns false' do
+        expect(service.active?).to be false
+      end
+    end
+  end
+
+  describe '#execute' do
+    context 'when Linear integration is not enabled' do
+      it 'returns error message' do
+        expect(service.execute({ 'term' => 'test' })).to eq('Linear integration is not enabled')
+      end
+    end
+
+    context 'when Linear integration is enabled' do
+      let(:linear_service) { instance_double(Integrations::Linear::ProcessorService) }
+
+      before do
+        create(:integrations_hook, :linear, account: account)
+        allow(Integrations::Linear::ProcessorService).to receive(:new).and_return(linear_service)
+      end
+
+      context 'when term is blank' do
+        it 'returns error message' do
+          expect(service.execute({ 'term' => '' })).to eq('Missing required parameters')
+        end
+      end
+
+      context 'when search returns error' do
+        before do
+          allow(linear_service).to receive(:search_issue).and_return({ error: 'API Error' })
+        end
+
+        it 'returns the error message' do
+          expect(service.execute({ 'term' => 'test' })).to eq('API Error')
+        end
+      end
+
+      context 'when search returns no issues' do
+        before do
+          allow(linear_service).to receive(:search_issue).and_return({ data: [] })
+        end
+
+        it 'returns no issues found message' do
+          expect(service.execute({ 'term' => 'test' })).to eq('No issues found, I should try another similar search term')
+        end
+      end
+
+      context 'when search returns issues' do
+        let(:issues) do
+          [{
+            'title' => 'Test Issue',
+            'id' => 'TEST-123',
+            'state' => { 'name' => 'In Progress' },
+            'priority' => 4,
+            'assignee' => { 'name' => 'John Doe' },
+            'description' => 'Test description'
+          }]
+        end
+
+        before do
+          allow(linear_service).to receive(:search_issue).and_return({ data: issues })
+        end
+
+        it 'returns formatted issues' do
+          result = service.execute({ 'term' => 'test' })
+          expect(result).to include('Total number of issues: 1')
+          expect(result).to include('Title: Test Issue')
+          expect(result).to include('ID: TEST-123')
+          expect(result).to include('State: In Progress')
+          expect(result).to include('Priority: Low')
+          expect(result).to include('Assignee: John Doe')
+          expect(result).to include('Description: Test description')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/search_documentation_service_spec.rb b/spec/enterprise/services/captain/tools/search_documentation_service_spec.rb
new file mode 100644
index 000000000..9f5586e6b
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/search_documentation_service_spec.rb
@@ -0,0 +1,77 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::SearchDocumentationService do
+  let(:assistant) { create(:captain_assistant) }
+  let(:service) { described_class.new(assistant) }
+  let(:question) { 'How to create a new account?' }
+  let(:answer) { 'You can create a new account by clicking on the Sign Up button.' }
+  let(:external_link) { 'https://example.com/docs/create-account' }
+
+  describe '#name' do
+    it 'returns the correct service name' do
+      expect(service.name).to eq('search_documentation')
+    end
+  end
+
+  describe '#description' do
+    it 'returns the service description' do
+      expect(service.description).to eq('Search and retrieve documentation from knowledge base')
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns the required parameters schema' do
+      expected_schema = {
+        type: 'object',
+        properties: {
+          search_query: {
+            type: 'string',
+            description: 'The search query to look up in the documentation.'
+          }
+        },
+        required: ['search_query']
+      }
+
+      expect(service.parameters).to eq(expected_schema)
+    end
+  end
+
+  describe '#execute' do
+    let!(:response) do
+      create(
+        :captain_assistant_response,
+        assistant: assistant,
+        question: question,
+        answer: answer,
+        status: 'approved'
+      )
+    end
+
+    let(:documentable) { create(:captain_document, external_link: external_link) }
+
+    context 'when matching responses exist' do
+      before do
+        response.update(documentable: documentable)
+        allow(Captain::AssistantResponse).to receive(:search).with(question).and_return([response])
+      end
+
+      it 'returns formatted responses for the search query' do
+        result = service.execute({ 'search_query' => question })
+
+        expect(result).to include(question)
+        expect(result).to include(answer)
+        expect(result).to include(external_link)
+      end
+    end
+
+    context 'when no matching responses exist' do
+      before do
+        allow(Captain::AssistantResponse).to receive(:search).with(question).and_return([])
+      end
+
+      it 'returns an empty string' do
+        expect(service.execute({ 'search_query' => question })).to eq('No FAQs found for the given query')
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/enterprise/conversations/permission_filter_service_spec.rb b/spec/enterprise/services/enterprise/conversations/permission_filter_service_spec.rb
index b26832faf..0cfec97eb 100644
--- a/spec/enterprise/services/enterprise/conversations/permission_filter_service_spec.rb
+++ b/spec/enterprise/services/enterprise/conversations/permission_filter_service_spec.rb
@@ -9,6 +9,8 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
   let(:admin) { create(:user, account: account, role: :administrator) }
   let(:agent) { create(:user, account: account, role: :agent) }
   let!(:inbox) { create(:inbox, account: account) }
+  let!(:inbox2) { create(:inbox, account: account) }
+  let!(:another_inbox_conversation) { create(:conversation, account: account, inbox: inbox2) }
 
   # This inbox_member is used to establish the agent's access to the inbox
   before { create(:inbox_member, user: agent, inbox: inbox) }
@@ -25,16 +27,14 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         expect(result).to include(assigned_conversation)
         expect(result).to include(unassigned_conversation)
         expect(result).to include(another_assigned_conversation)
-        expect(result.count).to eq(3)
+        expect(result.count).to eq(4)
       end
     end
 
     context 'when user is a regular agent' do
       it 'returns all conversations in assigned inboxes' do
-        inbox_ids = agent.inboxes.where(account_id: account.id).pluck(:id)
-
         result = Conversations::PermissionFilterService.new(
-          account.conversations.where(inbox_id: inbox_ids),
+          account.conversations,
           agent,
           account
         ).perform
@@ -42,6 +42,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         expect(result).to include(assigned_conversation)
         expect(result).to include(unassigned_conversation)
         expect(result).to include(another_assigned_conversation)
+        expect(result).not_to include(another_inbox_conversation)
         expect(result.count).to eq(3)
       end
     end
@@ -52,7 +53,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         # Create a new isolated test environment
         test_account = create(:account)
         test_inbox = create(:inbox, account: test_account)
-
+        test_inbox2 = create(:inbox, account: test_account)
         # Create test agent
         test_agent = create(:user, account: test_account, role: :agent)
         create(:inbox_member, user: test_agent, inbox: test_inbox)
@@ -66,6 +67,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         assigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: test_agent)
         unassigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: nil)
         other_assigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: create(:user, account: test_account))
+        other_inbox_conversation = create(:conversation, account: test_account, inbox: test_inbox2, assignee: nil)
 
         # Run the test
         result = Conversations::PermissionFilterService.new(
@@ -79,6 +81,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         expect(result).to include(assigned_conversation)
         expect(result).to include(unassigned_conversation)
         expect(result).to include(other_assigned_conversation)
+        expect(result).not_to include(other_inbox_conversation)
       end
     end
 
@@ -87,6 +90,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         # Create a new isolated test environment
         test_account = create(:account)
         test_inbox = create(:inbox, account: test_account)
+        test_inbox2 = create(:inbox, account: test_account)
 
         # Create test agent
         test_agent = create(:user, account: test_account, role: :agent)
@@ -101,6 +105,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         # Create some conversations
         other_conversation = create(:conversation, account: test_account, inbox: test_inbox)
         assigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: test_agent)
+        other_inbox_conversation = create(:conversation, account: test_account, inbox: test_inbox2, assignee: nil)
 
         # Run the test
         result = Conversations::PermissionFilterService.new(
@@ -114,6 +119,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         expect(result.first.assignee).to eq(test_agent)
         expect(result).to include(assigned_conversation)
         expect(result).not_to include(other_conversation)
+        expect(result).not_to include(other_inbox_conversation)
       end
     end
 
@@ -122,6 +128,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         # Create a new isolated test environment
         test_account = create(:account)
         test_inbox = create(:inbox, account: test_account)
+        test_inbox2 = create(:inbox, account: test_account)
 
         # Create test agent
         test_agent = create(:user, account: test_account, role: :agent)
@@ -137,6 +144,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         assigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: test_agent)
         unassigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: nil)
         other_assigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: create(:user, account: test_account))
+        other_inbox_conversation = create(:conversation, account: test_account, inbox: test_inbox2, assignee: nil)
 
         # Run the test
         result = Conversations::PermissionFilterService.new(
@@ -152,6 +160,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
 
         # Should NOT include conversations assigned to others
         expect(result).not_to include(other_assigned_conversation)
+        expect(result).not_to include(other_inbox_conversation)
       end
     end
 
@@ -160,6 +169,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         # Create a new isolated test environment
         test_account = create(:account)
         test_inbox = create(:inbox, account: test_account)
+        test_inbox2 = create(:inbox, account: test_account)
 
         # Create test agent
         test_agent = create(:user, account: test_account, role: :agent)
@@ -176,6 +186,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         assigned_to_agent = create(:conversation, account: test_account, inbox: test_inbox, assignee: test_agent)
         unassigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: nil)
         other_assigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: create(:user, account: test_account))
+        other_inbox_conversation = create(:conversation, account: test_account, inbox: test_inbox2, assignee: nil)
 
         # Run the test
         result = Conversations::PermissionFilterService.new(
@@ -191,6 +202,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         expect(result).to include(unassigned_conversation)
         expect(result).to include(assigned_to_agent)
         expect(result).not_to include(other_assigned_conversation)
+        expect(result).not_to include(other_inbox_conversation)
       end
     end
   end
diff --git a/spec/lib/integrations/linear/processor_service_spec.rb b/spec/lib/integrations/linear/processor_service_spec.rb
index 07cf27654..807e93c71 100644
--- a/spec/lib/integrations/linear/processor_service_spec.rb
+++ b/spec/lib/integrations/linear/processor_service_spec.rb
@@ -76,6 +76,7 @@ describe Integrations::Linear::ProcessorService do
         description: 'Issue description',
         assignee_id: 'user1',
         priority: 2,
+        state_id: 'state1',
         label_ids: %w[bug]
       }
     end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 9395f3e55..aef91603d 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -793,8 +793,8 @@ RSpec.describe Conversation do
     end
 
     context 'when a new conversation is created' do
-      it 'sets last_activity_at to the created_at time' do
-        expect(conversation.last_activity_at).to eq(conversation.created_at)
+      it 'sets last_activity_at to the created_at time (within DB precision)' do
+        expect(conversation.last_activity_at).to be_within(1.second).of(conversation.created_at)
       end
     end
 
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 4c66e37ee..b4be3ac5a 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -475,4 +475,35 @@ RSpec.describe Message do
       end
     end
   end
+
+  describe '#content' do
+    let(:conversation) { create(:conversation) }
+    let(:message) { create(:message, conversation: conversation, content_type: 'input_csat', content: 'Original content') }
+
+    it 'returns original content for web widget inbox' do
+      allow(message.inbox).to receive(:web_widget?).and_return(true)
+      expect(message.content).to eq('Original content')
+    end
+
+    context 'when inbox is not a web widget' do
+      before do
+        allow(message.inbox).to receive(:web_widget?).and_return(false)
+        allow(ENV).to receive(:fetch).with('FRONTEND_URL', nil).and_return('https://app.chatwoot.com')
+      end
+
+      it 'returns custom message with survey link when csat message is configured' do
+        allow(message.inbox).to receive(:csat_config).and_return({ 'message' => 'Custom survey message:' })
+        expected_content = "Custom survey message: https://app.chatwoot.com/survey/responses/#{conversation.uuid}"
+        expect(message.content).to eq(expected_content)
+      end
+
+      it 'returns default message with survey link when no custom csat message' do
+        allow(message.inbox).to receive(:csat_config).and_return(nil)
+        allow(I18n).to receive(:t).with('conversations.survey.response', link: "https://app.chatwoot.com/survey/responses/#{conversation.uuid}")
+                                  .and_return("Please rate your conversation: https://app.chatwoot.com/survey/responses/#{conversation.uuid}")
+        expected_content = "Please rate your conversation: https://app.chatwoot.com/survey/responses/#{conversation.uuid}"
+        expect(message.content).to eq(expected_content)
+      end
+    end
+  end
 end
diff --git a/spec/services/account/sign_up_email_validation_service_spec.rb b/spec/services/account/sign_up_email_validation_service_spec.rb
new file mode 100644
index 000000000..3f907f02c
--- /dev/null
+++ b/spec/services/account/sign_up_email_validation_service_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Account::SignUpEmailValidationService, type: :service do
+  let(:service) { described_class.new(email) }
+  let(:blocked_domains) { "gmail.com\noutlook.com" }
+  let(:valid_email_address) { instance_double(ValidEmail2::Address, valid?: true, disposable?: false) }
+  let(:disposable_email_address) { instance_double(ValidEmail2::Address, valid?: true, disposable?: true) }
+  let(:invalid_email_address) { instance_double(ValidEmail2::Address, valid?: false) }
+
+  before do
+    allow(GlobalConfigService).to receive(:load).with('BLOCKED_EMAIL_DOMAINS', '').and_return(blocked_domains)
+  end
+
+  describe '#perform' do
+    context 'when email is invalid format' do
+      let(:email) { 'invalid-email' }
+
+      it 'raises InvalidEmail with invalid message' do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(invalid_email_address)
+        expect { service.perform }.to raise_error do |error|
+          expect(error).to be_a(CustomExceptions::Account::InvalidEmail)
+          expect(error.message).to eq(I18n.t('errors.signup.invalid_email'))
+        end
+      end
+    end
+
+    context 'when domain is blocked' do
+      let(:email) { 'test@gmail.com' }
+
+      it 'raises InvalidEmail with blocked domain message' do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(valid_email_address)
+        expect { service.perform }.to raise_error do |error|
+          expect(error).to be_a(CustomExceptions::Account::InvalidEmail)
+          expect(error.message).to eq(I18n.t('errors.signup.blocked_domain'))
+        end
+      end
+    end
+
+    context 'when domain is blocked (case insensitive)' do
+      let(:email) { 'test@GMAIL.COM' }
+
+      it 'raises InvalidEmail with blocked domain message' do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(valid_email_address)
+        expect { service.perform }.to raise_error do |error|
+          expect(error).to be_a(CustomExceptions::Account::InvalidEmail)
+          expect(error.message).to eq(I18n.t('errors.signup.blocked_domain'))
+        end
+      end
+    end
+
+    context 'when email is from disposable provider' do
+      let(:email) { 'test@mailinator.com' }
+
+      it 'raises InvalidEmail with disposable message' do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(disposable_email_address)
+        expect { service.perform }.to raise_error do |error|
+          expect(error).to be_a(CustomExceptions::Account::InvalidEmail)
+          expect(error.message).to eq(I18n.t('errors.signup.disposable_email'))
+        end
+      end
+    end
+
+    context 'when email is valid business email' do
+      let(:email) { 'test@example.com' }
+
+      it 'returns true' do
+        allow(ValidEmail2::Address).to receive(:new).with(email).and_return(valid_email_address)
+        expect(service.perform).to be(true)
+      end
+    end
+  end
+end
diff --git a/spec/services/crm/leadsquared/mappers/contact_mapper_spec.rb b/spec/services/crm/leadsquared/mappers/contact_mapper_spec.rb
index 4e7c06fdb..b6bf51f93 100644
--- a/spec/services/crm/leadsquared/mappers/contact_mapper_spec.rb
+++ b/spec/services/crm/leadsquared/mappers/contact_mapper_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe Crm::Leadsquared::Mappers::ContactMapper do
           name: 'John',
           last_name: 'Doe',
           email: 'john@example.com',
+          # the phone number is intentionally wrong
           phone_number: '+1234567890'
         )
 
@@ -29,6 +30,19 @@ RSpec.describe Crm::Leadsquared::Mappers::ContactMapper do
           'Source' => 'Test Brand'
         )
       end
+
+      it 'represents the phone number correctly' do
+        contact.update!(
+          name: 'John',
+          last_name: 'Doe',
+          email: 'john@example.com',
+          phone_number: '+917507684392'
+        )
+
+        mapped_data = described_class.map(contact)
+
+        expect(mapped_data).to include('Mobile' => '+91-7507684392')
+      end
     end
   end
 end
diff --git a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
index 29f7136f1..85bb08d74 100644
--- a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
+++ b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
@@ -183,7 +183,7 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
         expect(result.length).to be <= described_class::ACTIVITY_NOTE_MAX_SIZE + 100
 
         # Verify that not all messages are included (some were truncated)
-        expect(messages.count).to be > result.scan(/John Doe:/).count
+        expect(messages.count).to be > result.scan('John Doe:').count
       end
 
       it 'respects the ACTIVITY_NOTE_MAX_SIZE constant' do
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..59d7c06b8 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,10 +60,14 @@
     $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'
-
+/platform/api/v1/users/{id}/token:
+  parameters:
+    - $ref: '#/parameters/platform_user_id'
+  post:
+    $ref: './platform/users/token.yml'
 
 # ---------------- end of platform path -----------#
 
@@ -74,7 +77,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 +85,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 +99,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 +108,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 +163,7 @@
 
 /survey/responses/{conversation_uuid}:
   parameters:
-    - $ref: '#/parameters/conversation_uuid'
+    - $ref: '#/components/parameters/conversation_uuid'
   get:
     $ref: ./survey/show.yml
 
@@ -175,19 +171,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 +193,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 +209,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 +225,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 +253,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 +268,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 +289,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 +327,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 +362,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 +371,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 +395,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 +410,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 +442,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 +466,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 +482,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 +496,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 +508,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 +527,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 +551,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 +574,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 +589,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/token.yml b/swagger/paths/platform/users/token.yml
new file mode 100644
index 000000000..f4fedc311
--- /dev/null
+++ b/swagger/paths/platform/users/token.yml
@@ -0,0 +1,42 @@
+tags:
+  - Users
+operationId: post-user-token
+summary: Get User Access Token
+description: Get the access token of a user
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+    schema:
+      type: object
+      properties:
+        access_token:
+          type: string
+          description: Access token of the user
+        expiry:
+          type: [integer, "null"]
+          description: Expiry timestamp
+        user:
+          type: object
+          properties:
+            id:
+              type: integer
+              description: User ID
+            name:
+              type: string
+              description: User's full name
+            display_name:
+              type: string
+              description: User's display name
+            email:
+              type: string
+              description: User's email address
+            pubsub_token:
+              type: string
+              description: User's pubsub token
+  401:
+    description: Unauthorized
+  404:
+    description: The given user does not exist
+    
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..8ce34b4ab 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": {
@@ -62,30 +29,39 @@
         "description": "Create an Account",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "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"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -93,7 +69,7 @@
     "/platform/api/v1/accounts/{account_id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -105,23 +81,39 @@
         "description": "Get the details of an account",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -134,30 +126,39 @@
         "description": "Update an account's attributes",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "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"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -170,9 +171,7 @@
         "description": "Delete an Account",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
           }
         ],
         "responses": {
@@ -180,10 +179,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 +204,7 @@
     "/platform/api/v1/accounts/{account_id}/account_users": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -203,38 +216,29 @@
         "description": "List all account users",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -247,57 +251,53 @@
         "description": "Create an Account User",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "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": {
             "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"
+                }
+              }
+            }
           }
         }
       },
@@ -310,28 +310,7 @@
         "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"
-                }
-              }
-            }
+            "platformAppApiKey": []
           }
         ],
         "responses": {
@@ -339,10 +318,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"
+                }
+              }
+            }
           }
         }
       }
@@ -357,24 +350,33 @@
         "description": "List all agent bots available",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -387,30 +389,39 @@
         "description": "Create an agent bot",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "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": {
             "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 +429,7 @@
     "/platform/api/v1/agent_bots/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/agent_bot_id"
+          "$ref": "#/components/parameters/agent_bot_id"
         }
       ],
       "get": {
@@ -430,23 +441,39 @@
         "description": "Get the details of an agent bot",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -459,30 +486,39 @@
         "description": "Update an agent bot's attributes",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "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": {
             "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"
+                }
+              }
+            }
           }
         }
       },
@@ -495,9 +531,7 @@
         "description": "Delete an AgentBot",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
           }
         ],
         "responses": {
@@ -505,10 +539,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"
+                }
+              }
+            }
           }
         }
       }
@@ -523,30 +571,39 @@
         "description": "Create a User",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "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": {
             "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 +611,7 @@
     "/platform/api/v1/users/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/platform_user_id"
+          "$ref": "#/components/parameters/platform_user_id"
         }
       ],
       "get": {
@@ -566,23 +623,39 @@
         "description": "Get the details of an user",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -595,30 +668,39 @@
         "description": "Update a user's attributes",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "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": {
             "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"
+                }
+              }
+            }
           }
         }
       },
@@ -631,9 +713,7 @@
         "description": "Delete a User",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
           }
         ],
         "responses": {
@@ -641,10 +721,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 +746,7 @@
     "/platform/api/v1/users/{id}/login": {
       "parameters": [
         {
-          "$ref": "#/parameters/platform_user_id"
+          "$ref": "#/components/parameters/platform_user_id"
         }
       ],
       "get": {
@@ -664,9 +758,65 @@
         "description": "Get the sso link of a user",
         "security": [
           {
-            "platformAppApiKey": [
-
-            ]
+            "platformAppApiKey": []
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "url": {
+                      "type": "string",
+                      "description": "SSO url to autenticate the user"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "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"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/platform/api/v1/users/{id}/token": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/platform_user_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Users"
+        ],
+        "operationId": "post-user-token",
+        "summary": "Get User Access Token",
+        "description": "Get the access token of a user",
+        "security": [
+          {
+            "platformAppApiKey": []
           }
         ],
         "responses": {
@@ -675,9 +825,41 @@
             "schema": {
               "type": "object",
               "properties": {
-                "url": {
+                "access_token": {
                   "type": "string",
-                  "description": "SSO url to autenticate the user"
+                  "description": "Access token of the user"
+                },
+                "expiry": {
+                  "type": [
+                    "integer",
+                    "null"
+                  ],
+                  "description": "Expiry timestamp"
+                },
+                "user": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "description": "User ID"
+                    },
+                    "name": {
+                      "type": "string",
+                      "description": "User's full name"
+                    },
+                    "display_name": {
+                      "type": "string",
+                      "description": "User's display name"
+                    },
+                    "email": {
+                      "type": "string",
+                      "description": "User's email address"
+                    },
+                    "pubsub_token": {
+                      "type": "string",
+                      "description": "User's pubsub token"
+                    }
+                  }
                 }
               }
             }
@@ -694,7 +876,7 @@
     "/public/api/v1/inboxes/{inbox_identifier}": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         }
       ],
       "get": {
@@ -704,21 +886,37 @@
         "operationId": "get-details-of-a-inbox",
         "summary": "Inbox details",
         "description": "Get the details of an inbox",
-        "security": [
-
-        ],
+        "security": [],
         "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 +924,7 @@
     "/public/api/v1/inboxes/{inbox_identifier}/contacts": {
       "parameters": [
         {
-          "$ref": "#/parameters/public_inbox_identifier"
+          "$ref": "#/components/parameters/public_inbox_identifier"
         }
       ],
       "post": {
@@ -736,28 +934,37 @@
         "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"
+        "security": [],
+        "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 +972,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": {
@@ -778,21 +985,37 @@
         "operationId": "get-details-of-a-contact",
         "summary": "Get a contact",
         "description": "Get the details of a contact",
-        "security": [
-
-        ],
+        "security": [],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -803,28 +1026,37 @@
         "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"
+        "security": [],
+        "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 +1064,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": {
@@ -845,28 +1077,37 @@
         "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"
+        "security": [],
+        "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 +1118,31 @@
         "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 +1150,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 +1166,37 @@
         "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 +1204,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 +1220,37 @@
         "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 +1258,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 +1274,62 @@
         "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 +1337,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 +1353,30 @@
         "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 +1384,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": {
@@ -1056,28 +1400,37 @@
         "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"
+        "security": [],
+        "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 +1441,31 @@
         "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 +1473,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": {
@@ -1127,101 +1492,37 @@
         "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"
-            }
-          }
-        ],
-        "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"
-                  }
-                }
+        "security": [],
+        "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 +1530,7 @@
     "/survey/responses/{conversation_uuid}": {
       "parameters": [
         {
-          "$ref": "#/parameters/conversation_uuid"
+          "$ref": "#/components/parameters/conversation_uuid"
         }
       ],
       "get": {
@@ -1239,9 +1540,7 @@
         "operationId": "get-csat-survey-page",
         "summary": "Get CSAT survey page",
         "description": "You can redirect the client to this URL, instead of implementing the CSAT survey component yourself.",
-        "security": [
-
-        ],
+        "security": [],
         "responses": {
           "200": {
             "description": "Success"
@@ -1252,7 +1551,7 @@
     "/api/v1/accounts/{account_id}/agent_bots": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -1262,19 +1561,35 @@
         "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 +1600,41 @@
         "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 +1642,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 +1655,41 @@
         "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 +1700,41 @@
         "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 +1745,34 @@
         "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": {
@@ -1406,24 +1792,33 @@
         "description": "Get Details of Agents in an Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -1436,66 +1831,39 @@
         "description": "Add a new Agent to Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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": {
             "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 +1871,7 @@
     "/api/v1/accounts/{account_id}/agents/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "patch": {
@@ -1515,66 +1883,60 @@
         "description": "Update an Agent in Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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": {
-              "$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"
+                }
+              }
+            }
           }
         }
       },
@@ -1587,18 +1949,18 @@
         "description": "Remove an Agent from Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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": {
@@ -1606,10 +1968,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 +1993,7 @@
     "/api/v1/accounts/{account_id}/canned_responses": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -1629,24 +2005,33 @@
         "description": "Get Details of Canned Responses in an Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -1659,30 +2044,39 @@
         "description": "Add a new Canned Response to Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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": {
             "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,52 +2084,72 @@
     "/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",
         "description": "Update a Canned Response in Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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": {
             "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"
+                }
+              }
+            }
           }
         }
       },
@@ -1748,16 +2162,16 @@
         "description": "Remove a Canned Response from Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "parameters": [
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the canned response to be deleted"
           }
@@ -1767,10 +2181,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 +2206,7 @@
     "/api/v1/accounts/{account_id}/custom_attribute_definitions": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -1791,11 +2219,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
           }
@@ -1803,24 +2233,33 @@
         "description": "Get details of custom attributes in an Account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -1833,30 +2272,39 @@
         "description": "Add a new custom attribute to account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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": {
             "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 +2312,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 +2330,22 @@
         ],
         "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 +2353,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"
+                }
+              }
+            }
           }
         }
       },
@@ -1917,40 +2392,60 @@
         "description": "Update a custom attribute in account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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": {
             "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"
+                }
+              }
+            }
           }
         }
       },
@@ -1963,19 +2458,19 @@
         "description": "Remove a custom attribute from account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
           }
@@ -1985,10 +2480,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 +2508,43 @@
           "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 +2556,45 @@
         "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 +2603,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 +2621,42 @@
         ],
         "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 +2666,52 @@
         ],
         "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 +2721,239 @@
         ],
         "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 +2966,60 @@
         "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"
@@ -2246,99 +3029,107 @@
         "summary": "Contact Filter",
         "security": [
           {
-            "userApiKey": [
-
-            ]
-          },
-          {
-            "agentBotApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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 +3145,77 @@
         "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 +3228,21 @@
         "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 +3250,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 +3284,7 @@
     "/api/v1/accounts/{account_id}/automation_rules": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -2457,33 +3295,42 @@
         "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",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -2496,30 +3343,39 @@
         "description": "Add a new automation rule to account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -2527,12 +3383,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 +3402,18 @@
         "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 +3421,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"
+                }
+              }
+            }
           }
         }
       },
@@ -2577,40 +3460,60 @@
         "description": "Update a automation rule in account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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"
+            "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"
+                }
+              }
+            }
           }
         }
       },
@@ -2623,16 +3526,16 @@
         "description": "Remove a automation rule from account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "parameters": [
           {
             "in": "path",
             "name": "id",
-            "type": "integer",
+            "schema": {
+              "type": "integer"
+            },
             "required": true,
             "description": "The ID of the automation rule to be deleted"
           }
@@ -2642,10 +3545,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 +3570,7 @@
     "/api/v1/accounts/{account_id}/portals": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "post": {
@@ -2665,30 +3582,39 @@
         "description": "Add a new portal to account",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       },
@@ -2700,77 +3626,105 @@
         "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": [
-
-            ]
+            "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"
-          }
-        }
-      },
-      "patch": {
-        "tags": [
-          "Help Center"
-        ],
-        "operationId": "update-new-portal-to-account",
-        "summary": "update a new portal",
-        "description": "update a new portal to account",
-        "security": [
-          {
-            "userApiKey": [
-
-            ]
-          }
-        ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/portal_create_update_payload"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/portal"
-            }
-          },
-          "403": {
-            "description": "Access denied"
-          }
         }
       }
     },
-    "/api/v1/accounts/{account_id}/portals/{portal_id}/categories": {
+    "/api/v1/accounts/{account_id}/portals/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         },
         {
-          "$ref": "#/parameters/portal_id"
+          "$ref": "#/components/parameters/portal_id"
+        }
+      ],
+      "patch": {
+        "tags": [
+          "Help Center"
+        ],
+        "operationId": "update-portal-to-account",
+        "summary": "Update a portal",
+        "description": "Update a portal to account",
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/portal_create_update_payload"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/portal"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/portals/{id}/categories": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        },
+        {
+          "$ref": "#/components/parameters/portal_id"
         }
       ],
       "post": {
@@ -2782,41 +3736,50 @@
         "description": "Add a new category to portal",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
+            "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": {
@@ -2828,30 +3791,39 @@
         "description": "Add a new article to portal",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
+            "description": "Access denied",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
           }
         }
       }
@@ -2859,7 +3831,7 @@
     "/api/v1/accounts/{account_id}/conversations/meta": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -2869,66 +3841,85 @@
         "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 +3928,12 @@
           },
           "400": {
             "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
             }
           }
         }
@@ -2947,7 +3942,7 @@
     "/api/v1/accounts/{account_id}/conversations": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -2957,77 +3952,104 @@
         "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,140 +4060,59 @@
         ],
         "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": [
-
-            ]
+            "userApiKey": []
           },
           {
-            "agentBotApiKey": [
-
-            ]
+            "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": {
+        "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 +4120,7 @@
     "/api/v1/accounts/{account_id}/conversations/filter": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "post": {
@@ -3191,99 +4132,104 @@
         "summary": "Conversations Filter",
         "security": [
           {
-            "userApiKey": [
-
-            ]
-          },
-          {
-            "agentBotApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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": "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 +4238,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 +4250,42 @@
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -3329,52 +4298,64 @@
         "description": "Update Conversation Attributes",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           },
           {
-            "agentBotApiKey": [
-
-            ]
+            "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": {
             "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 +4363,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": {
@@ -3397,52 +4378,67 @@
         "description": "Toggles the status of the conversation between open and resolved",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           },
           {
-            "agentBotApiKey": [
-
-            ]
+            "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": {
             "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 +4446,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": {
@@ -3465,51 +4461,62 @@
         "description": "Toggles the priority of conversation",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           },
           {
-            "agentBotApiKey": [
-
-            ]
+            "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": {
             "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 +4524,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": {
@@ -3532,57 +4539,68 @@
         "description": "Updates the custom attributes of a conversation",
         "security": [
           {
-            "userApiKey": [
-
-            ]
-          },
-          {
-            "agentBotApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
-        "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,63 +4608,79 @@
     "/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",
         "description": "Assign a conversation to an agent or a team",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           },
           {
-            "agentBotApiKey": [
-
-            ]
+            "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": {
             "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 +4688,125 @@
     "/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 +4819,50 @@
         "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 +4874,22 @@
         ],
         "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 +4897,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 +4936,56 @@
         "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 +4997,66 @@
         ],
         "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 +5069,21 @@
         "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 +5091,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 +5129,69 @@
         ],
         "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 +5199,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": {
@@ -4063,32 +5214,48 @@
         "description": "Get Details of Agents in an Inbox",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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 +5263,7 @@
     "/api/v1/accounts/{account_id}/inbox_members": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "post": {
@@ -4108,57 +5275,84 @@
         "description": "Add a new Agent to Inbox",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
+        "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"
+                }
+              }
+            }
           }
         }
       },
@@ -4171,57 +5365,84 @@
         "description": "All agents except the one passed in params will be removed",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
+        "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"
+                }
+              }
+            }
           }
         }
       },
@@ -4234,50 +5455,69 @@
         "description": "Remove an Agent from Inbox",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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"
+        "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 +5525,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 +5537,53 @@
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -4333,45 +5596,59 @@
         "description": "Create a new message in the conversation",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           },
           {
-            "agentBotApiKey": [
-
-            ]
+            "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": {
             "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 +5656,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 +5671,35 @@
         ],
         "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 +5707,7 @@
     "/api/v1/accounts/{account_id}/integrations/apps": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -4420,23 +5716,46 @@
         ],
         "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 +5768,46 @@
         "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 +5820,49 @@
         "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 +5873,17 @@
         "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 +5891,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 +5921,31 @@
         "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 +5953,7 @@
     "/api/v1/accounts/{account_id}/teams": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -4572,20 +5962,36 @@
         ],
         "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 +6001,47 @@
         ],
         "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 +6049,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 +6061,42 @@
         ],
         "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 +6106,42 @@
         ],
         "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 +6151,35 @@
         ],
         "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 +6187,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": {
@@ -4720,35 +6202,51 @@
         "description": "Get Details of Agents in an Team",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "userApiKey": []
           }
         ],
         "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"
+                }
+              }
+            }
           }
         }
       },
@@ -4761,52 +6259,78 @@
         "description": "Add a new Agent to Team",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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": {
             "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"
+                }
+              }
+            }
           }
         }
       },
@@ -4819,52 +6343,78 @@
         "description": "All agents except the one passed in params will be removed",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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": {
             "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"
+                }
+              }
+            }
           }
         }
       },
@@ -4877,46 +6427,64 @@
         "description": "Remove an Agent from Team",
         "security": [
           {
-            "userApiKey": [
-
-            ]
+            "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": {
             "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 +6492,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 +6516,35 @@
         "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 +6557,44 @@
         "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 +6602,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 +6615,41 @@
         "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 +6659,42 @@
         ],
         "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 +6704,35 @@
         ],
         "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 +6740,7 @@
     "/api/v1/accounts/{account_id}/webhooks": {
       "parameters": [
         {
-          "$ref": "#/parameters/account_id"
+          "$ref": "#/components/parameters/account_id"
         }
       ],
       "get": {
@@ -5087,20 +6749,36 @@
         ],
         "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 +6788,47 @@
         ],
         "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 +6836,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 +6848,47 @@
         ],
         "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 +6898,35 @@
         ],
         "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 +6934,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 +6973,54 @@
         ],
         "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 +7028,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 +7064,42 @@
         ],
         "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 +7107,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 +7128,54 @@
         ],
         "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 +7183,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 +7212,2593 @@
         ],
         "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 +9828,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 +10189,6 @@
         "Agents",
         "Canned Responses",
         "Contacts",
-        "Contact Labels",
-        "Conversation Assignment",
-        "Conversation Labels",
         "Conversations",
         "Custom Attributes",
         "Custom Filters",