diff --git a/training_data/catbot-en.yml b/training_data/catbot-en.yml
index b2fc01ca71ee5b6bccfd13fa224b648b41ca0a02..b075220cf78e89ce4d0dfe9f2ee78d3ef1a73e23 100644
--- a/training_data/catbot-en.yml
+++ b/training_data/catbot-en.yml
@@ -237,7 +237,7 @@ interactions:
     answer:
       - Sorry, I couldn't understand what you said, please choose one of the installations topics, or `return` to the main topics
       - I don't understand, please choose one of the installation topics, or `get back` to the main topics
-    event: respond
+    event: error
     type: random
 
 #Support Plans
@@ -314,14 +314,6 @@ interactions:
     event: respond
     type: block
 
-  - name: support-error
-    level: support
-    answer:
-      - sorry, I don't understand, are we still talking about support?
-      - if no, please let me know if you wanna `go back` to the main topics.
-    event: respond
-    type: block
-
   - name: support-return
     level: support
     expect:
@@ -337,6 +329,14 @@ interactions:
     event: respond
     type: block
 
+  - name: support-error
+    level: support
+    answer:
+      - sorry, I don't understand, are we still talking about support?
+      - if no, please let me know if you wanna `go back` to the main topics.
+    event: error
+    type: block
+
 # Product Features
 
   - name: product-intro
@@ -542,62 +542,381 @@ interactions:
     answer:
       - sorry, I don't understand, are we still talking about the product?
       - if no, please let me know if you wanna `go back` to the main topics.
+    event: error
+    type: block
+
+# Cloud Services
+
+  - name: cloud-intro
+    level: cloud
+    expect:
+      - Cloud Services
+      - host in the cloud
+      - rocketchat cloud
+      - hosting
+    answer:
+      - "About our Cloud Services, I can guide you trough these subjects:"
+      - |
+        - Pricing
+        - User Limits
+        - Avaiable Resources
+        - Exporting your data
+        - Reporting bugs and Support
+    next:
+      interactions:
+        - cloud-pricing
+        - cloud-limits
+        - cloud-export
+        - cloud-support
+        - cloud-return
+      trust: .9
+      error:
+        - cloud-error
+    event: respond
+    type: block
+
+  - name: cloud-pricing
+    level: cloud
+    expect:
+      - pricing
+      - how much it costs
+      - cloud prices
+    answer:
+      - "About the prices, we have 3 tiers in our cloud:"
+      - |
+        - Small ($50/m)
+        - Medium ($200/m)
+        - Large ($500/m)
+      - please checkout the details at https://rocket.chat/cloud
+    event: respond
+    type: block
+
+  - name: cloud-limits
+    level: cloud
+    expect:
+      - User limits
+      - mesage limits
+      - cloud limits
+      - cloud resources
+    answer:
+      - Our cloud instances has different limits regarding registered users and storage consuming.
+      - We can setup instances to be able to register even 50k users, but if yoou wanna dive into the details,
+      - I suggest you take a look in https://rocket.chat/cloud
+    event: respond
+    type: block
+
+  - name: cloud-export
+    level: cloud
+    expect:
+      - Exporting your data
+      - export users mesages
+      - download database
+      - export database
+    answer:
+      - In the cloud hosted intances you can have your data backup exported,
+      - you just need to ask for it by sending an e-mail to cloud@rocket.chat.
+      - We hope to be able to provide this as an auto service very soon.
+    event: respond
+    type: block
+
+  - name: cloud-support
+    level: cloud
+    expect:
+      - Reporting bugs and Support
+      - report Errors
+      - found an Error
+      - need help support
+    answer:
+      - If you found a bug, please be kind to report it in https://github.com/RocketChat/Rocket.Chat/issues
+      - but if you need some assistance and support, please send us an e-mail to cloud@rocket.chat.
+      - "if you prefer you can ask for community help in #support channel"
+    event: respond
+    type: block
+
+  - name: cloud-return
+    level: cloud
+    expect:
+      - go back
+      - get back
+      - that is not what I am looking for
+      - return
+      - reset
+      - it's not that
+    answer:
+      - ok, let's get back on the main topics.
+    context: clear
+    event: respond
+    type: block
+
+  - name: cloud-error
+    level: cloud
+    answer:
+      - sorry, I don't understand, are we still talking about the product?
+      - if no, please let me know if you wanna `go back` to the main topics.
+    event: error
+    type: block
+
+
+# Development and White Labeling
+
+  - name: development-intro
+    level: development
+    expect:
+      - Development and White Labeling
+      - hire Services
+      - pay for new features
+      - customize with my logo
+    answer:
+      - |
+        About our services of white labeling and developing, wich of the subjects bellow can I help you with?
+        - Develop new Features
+        - Integrations with Rocket.Chat
+        - Customize the Web Interface
+        - Customize the App
+        - SDK for mobile apps
+    next:
+      interactions:
+        - development-features
+        - development-integrations
+        - development-custom-web
+        - development-custom-app
+        - development-sdk
+        - development-return
+      trust: .9
+      error:
+        - development-error
+    event: respond
+    type: block
+
+  - name: development-features
+    level: development
+    expect:
+      - Develop new Features
+      - hire developers
+      - pay for features
+      - how much it costs a developer hour
+    answer:
+      - |
+        You can hire development hours from Rocket.Chat engineers to develop new features,
+        or just to offer technical consultting in your own project.
+        To get a quote please send an e-mail to sales@rocket.chat
+    event: respond
+    type: block
+
+  - name: development-integrations
+    level: development
+    expect:
+      - Integrations with Rocket.Chat
+      - incoming webhook
+      - outgoing webhook
+      - create an integration
+    answer:
+      - |
+        We offeer a few ways to integrate Rocket.Chat with your favourite platforms
+        basically we can integrate with anything that has a webhook or an API
+        Check out our Webhooks, REST API and Realtime-API docs at
+        - https://rocket.chat/docs/administrator-guides/integrations/
+        - https://rocket.chat/docs/developer-guides/
     event: respond
     type: block
 
-# # Cloud Services
-#
-#   - name:
-#     level:
-#     expect:
-#       -
-#     answer:
-#       -
-#     next:
-#       interactions:
-#         -
-#       trust: .9
-#       error:
-#         -
-#     event: respond
-#     type: block
-#
-#
-# # Development and White Labeling
-#
-#   - name:
-#     level:
-#     expect:
-#       -
-#     answer:
-#       -
-#     next:
-#       interactions:
-#         -
-#       trust: .9
-#       error:
-#         -
-#     event: respond
-#     type: block
-#
-#
-# # Partnership
-#
-#   - name:
-#     level:
-#     expect:
-#       -
-#     answer:
-#       -
-#     next:
-#       interactions:
-#         -
-#       trust: .9
-#       error:
-#         -
-#     event: respond
-#     type: block
-#
+  - name: development-custom-web
+    level: development
+    expect:
+      - Customize the Web Interface
+      - change logo
+      - change colors
+      - custom css
+      - apply my visual indetity
+      - change web interface appearence
+      - change web theme
+    answer:
+      - |
+        You can change web interface logo and color schemes by configuring
+        settings in Administration > Assets, for changing logo files,
+        and in Administration > Layout, to change color schemes and CSS
+    event: respond
+    type: block
+
+  - name: development-custom-app
+    level: development
+    expect:
+      - Customize the App
+      - create new app interface
+      - change app icon
+      - change app colors
+    answer:
+      - |
+        You know, the Rocket.Chat apps are also open source, you can customize it's icons and colors,
+        but you will need to recompile and publish the apps with different names.
+        Checkout the github repositories:
+          - https://github.com/RocketChat/Rocket.Chat.iOS
+          - https://github.com/RocketChat/Rocket.Chat.Android
+    event: respond
+    type: block
+
+  - name: development-sdk
+    level: development
+    expect:
+      - SDK for mobile apps
+      - software development kit
+      - tools for mobile Apps
+      - mobile development
+    answer:
+      - |
+        If you're interested in integrating your app with Rocket.Chat, you should take a look at the
+        Software Development Kits that we provide, like these:
+          - https://github.com/RocketChat/Rocket.Chat.Java.SDK
+          - https://github.com/RocketChat/Rocket.Chat.Android.SDK
+          - https://github.com/RocketChat/Rocket.Chat.iOS.SDK
+          - https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK
+    event: respond
+    type: block
+
+  - name: development-return
+    level: development
+    expect:
+      - go back
+      - get back
+      - that is not what I am looking for
+      - return
+      - reset
+      - it's not that
+    answer:
+      - ok, let's get back on the main topics.
+    context: clear
+    event: respond
+    type: block
+
+  - name: development-error
+    level: development
+    answer:
+      - sorry, I don't understand, are we still talking about development and white labeling?
+      - if no, please let me know if you wanna `go back` to the main topics.
+    event: error
+    type: block
+
+# Partnership
+
+  - name: partnership-intro
+    level: partnership
+    expect:
+      - Partnership
+    answer:
+      - |
+        We can develop all kinds of partnership, and we love to do so. If you're interested I can help you with the following:
+        - Sponsorship
+        - Non-profit Projects
+        - Big Challenges
+        - Cutting Edge Technologies
+        - Become a Sales Representative
+    next:
+      interactions:
+        - partnership-sponsor
+        - partnership-nonprofit
+        - partnership-challenge
+        - partnership-cutting-edge
+        - partnership-sales
+        - partnership-return
+      trust: .9
+      error:
+        - partnership-error
+    event: respond
+    type: block
+
+  - name: partnership-sponsor
+    level: partnership
+    expect:
+      - Sponsorship
+    answer:
+      - |
+        About Sponsorships, if you're interested in having Rocket.Chat as a sponsor of a project or an event,
+        please come in touch by e-mail trough sales@rocket.chat,
+        we love to participate in OpenSource initiatives.
+    event: respond
+    type: block
+
+  - name: partnership-nonprofit
+    level: partnership
+    expect:
+      - Non-profit Projects
+      - non profit initiative
+      - non profit organizations
+    answer:
+      - |
+        If you are part of a non-profit initiative and want some help with your communication,
+        please send us an e-mail in contact@rocket.chat telling more about your goals
+        so we can start changing some ideas on how to make the world a better place.
+    event: respond
+    type: block
+
+  - name: partnership-challenge
+    level: partnership
+    expect:
+      - Big Challenges
+      - have a big challenge
+      - need a partner
+      - can you do This
+    answer:
+      - |
+        Rocket.Chat is very well tested platform, showing great performance in all kinds of scenarios
+        but still from time to time we face our selves with new challenges! And that's offtenly fun =)
+        If you have big communication challenge to face and think that we can help you with it,
+        please send us an e-mail to contact@rocket.chat, or come to the #support channel =)
+    event: respond
+    type: block
+
+  - name: partnership-cutting-edge
+    level: partnership
+    expect:
+      - Cutting Edge Technologies
+      - new technology
+      - science and technology Development
+    answer:
+      - |
+        We love to develop new technologies, pushing science foward and helping human kind to develop it self
+        is one of the things that make us get out of bed every day.
+        If you need a partner to help with the development of some kind of cutting-edge tecnology,
+        please send us an e-mail to contact@rocket.chat, or come to the #support channel =)
+    event: respond
+    type: block
+
+  - name: partnership-sales
+    level: partnership
+    expect:
+      - Become a Sales Representative
+      - region sales representative
+      - services and support representative
+    answer:
+      - |
+        Rocket.Chat acts on the five continnents with the help of regional representatives,
+        If you're interested in becoming one of our sales representatives,
+        please send us an e-mail to sales@rocket.chat, or create a channel in https://open.rocket.chat and invite our team.
+    event: respond
+    type: block
+
+  - name: partnership-return
+    level: partnership
+    expect:
+      - go back
+      - get back
+      - that is not what I am looking for
+      - return
+      - reset
+      - it's not that
+    answer:
+      - ok, let's get back on the main topics.
+    context: clear
+    event: respond
+    type: block
+
+  - name: partnership-error
+    level: partnership
+    answer:
+      - sorry, I don't understand, are we still talking about partnership?
+      - if no, please let me know if you wanna `go back` to the main topics.
+    event: error
+    type: block
 
 # chit-chat
   - name: cc-yoda-quote