diff --git a/data/nlu/chitchat.yml b/data/nlu/chitchat.yml
index ffebf4c..dc5101c 100644
--- a/data/nlu/chitchat.yml
+++ b/data/nlu/chitchat.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 nlu:
 - intent: chitchat/nicetomeetyou
   examples: |
diff --git a/data/nlu/custom_actions.yml b/data/nlu/custom_actions.yml
index 8a17733..69615fc 100644
--- a/data/nlu/custom_actions.yml
+++ b/data/nlu/custom_actions.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 nlu:
 - intent: user_info
   examples: |
diff --git a/data/nlu/faq.yml b/data/nlu/faq.yml
index 2bf4522..ccf5f39 100644
--- a/data/nlu/faq.yml
+++ b/data/nlu/faq.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 nlu:
 - intent: faq/osm_intro
   examples: |
diff --git a/data/nlu/general.yml b/data/nlu/general.yml
index a976f60..0da3105 100644
--- a/data/nlu/general.yml
+++ b/data/nlu/general.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 nlu:
 - intent: greet
   examples: |
diff --git a/data/nlu/lookups/tags.yml b/data/nlu/lookups/tags.yml
index 9c415f5..9763f9f 100644
--- a/data/nlu/lookups/tags.yml
+++ b/data/nlu/lookups/tags.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 nlu:
   - lookup: tag
     examples: |
diff --git a/data/nlu/out_of_scope.yml b/data/nlu/out_of_scope.yml
index 9599e24..edfff4c 100644
--- a/data/nlu/out_of_scope.yml
+++ b/data/nlu/out_of_scope.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 nlu:
 - intent: out_of_scope/non_english
   examples: |
diff --git a/data/responses/responses.yml b/data/responses/responses.yml
index f0e3c14..4d53aec 100644
--- a/data/responses/responses.yml
+++ b/data/responses/responses.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 responses:
   utter_faq/osm_common_errors:
   - text: You can have a look about common geometric errors while editing map at https://wiki.openstreetmap.org/wiki/Error_reporting and other most common errors user make at https://help.openstreetmap.org/questions/1022/what-are-the-most-common-mapping-mistakes-that-other-users-make?sort=votes&page=2
diff --git a/data/rules/rules.yml b/data/rules/rules.yml
index 6266721..77b6529 100644
--- a/data/rules/rules.yml
+++ b/data/rules/rules.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 rules:
 - rule: Say goodbye anytime the user says goodbye
   steps:
diff --git a/data/stories/stories.yml b/data/stories/stories.yml
index a54352f..73d954e 100644
--- a/data/stories/stories.yml
+++ b/data/stories/stories.yml
@@ -1,4 +1,4 @@
-version: "2.0"
+version: "3.1"
 stories:
 - story: happy chitchat path 1
   steps:
diff --git a/domain.yml b/domain.yml
index 6c2db14..9dcd5f5 100644
--- a/domain.yml
+++ b/domain.yml
@@ -1,4 +1,4 @@
-version: '2.0'
+version: '3.1'
 session_config:
   session_expiration_time: 60
   carry_over_slots_to_new_session: true
@@ -35,16 +35,24 @@ entities:
 slots:
   username:
     type: text
+    mappings:
+    - type: from_text
     influence_conversation: false
   response_feedback_message:
     type: any
+    mappings:
+    - type: from_text
     influence_conversation: false
   tag:
     type: text
+    mappings:
+    - type: from_text
     influence_conversation: false
   requested_slot:
-    type: unfeaturized
+    type: any
     influence_conversation: false
+    mappings:
+    - type: custom
 responses:
   utter_greet_guide:
   - buttons:
@@ -344,13 +352,10 @@ actions:
 forms:
   username_form:
     required_slots:
-      username:
-      - type: from_text
+        - username
   response_feedback_form:
     required_slots:
-      response_feedback_message:
-      - type: from_text
+        - response_feedback_message
   tag_form:
     required_slots:
-      tag:
-      - type: from_text
+        - tag