Update snips-model-aglHEADmaster

 - Expanded the dataset for intent HVACTemperature, HVACFanSpeed
   and VolumeControl.
 - Add MediaControl intent.

Bug-AGL: SPEC-5200
Change-Id: Idd7e85a1beb7126350ecee552ac6bb0db5008c24
Signed-off-by: Anuj Solanki <anuj603362@gmail.com>

29 files changed, 1855 insertions, 715 deletions

diff --git a/model/custom_entity_parser/parser/metadata.json b/model/custom_entity_parser/parser/metadata.json
index 10661f5..cb04348 100644
--- a/model/custom_entity_parser/parser/metadata.json
+++ b/model/custom_entity_parser/parser/metadata.json
@@ -9,16 +9,32 @@
       "entity_parser": "parser_2"
     },
     {
-      "entity_identifier": "numeric_value",
+      "entity_identifier": "media_album",
       "entity_parser": "parser_3"
     },
     {
-      "entity_identifier": "to_or_by",
+      "entity_identifier": "media_artist",
       "entity_parser": "parser_4"
     },
     {
-      "entity_identifier": "volume_control_action",
+      "entity_identifier": "media_control_action",
       "entity_parser": "parser_5"
+    },
+    {
+      "entity_identifier": "media_item",
+      "entity_parser": "parser_6"
+    },
+    {
+      "entity_identifier": "numeric_value",
+      "entity_parser": "parser_7"
+    },
+    {
+      "entity_identifier": "to_or_by",
+      "entity_parser": "parser_8"
+    },
+    {
+      "entity_identifier": "volume_control_action",
+      "entity_parser": "parser_9"
     }
   ]
 }
\ No newline at end of file
diff --git a/model/custom_entity_parser/parser/parser_1/parser b/model/custom_entity_parser/parser/parser_1/parser
index 4885ea2..911a1b9 100644
--- a/model/custom_entity_parser/parser/parser_1/parser
+++ b/model/custom_entity_parser/parser/parser_1/parser
diff --git a/model/custom_entity_parser/parser/parser_2/parser b/model/custom_entity_parser/parser/parser_2/parser
index 054918d..b2e4492 100644
--- a/model/custom_entity_parser/parser/parser_2/parser
+++ b/model/custom_entity_parser/parser/parser_2/parser
diff --git a/model/custom_entity_parser/parser/parser_3/metadata.json b/model/custom_entity_parser/parser/parser_3/metadata.json
index 05d57ee..42c4fe4 100644
--- a/model/custom_entity_parser/parser/parser_3/metadata.json
+++ b/model/custom_entity_parser/parser/parser_3/metadata.json
@@ -1 +1 @@
-{"version":"0.8.0","parser_filename":"parser","threshold":0.8,"stop_words":[],"edge_cases":[]}
\ No newline at end of file
+{"version":"0.8.0","parser_filename":"parser","threshold":1.0,"stop_words":[],"edge_cases":[]}
\ No newline at end of file
diff --git a/model/custom_entity_parser/parser/parser_3/parser b/model/custom_entity_parser/parser/parser_3/parser
index 64da981..02455b4 100644
--- a/model/custom_entity_parser/parser/parser_3/parser
+++ b/model/custom_entity_parser/parser/parser_3/parser
diff --git a/model/custom_entity_parser/parser/parser_4/parser b/model/custom_entity_parser/parser/parser_4/parser
index a89bce2..6ffca45 100644
--- a/model/custom_entity_parser/parser/parser_4/parser
+++ b/model/custom_entity_parser/parser/parser_4/parser
diff --git a/model/custom_entity_parser/parser/parser_5/parser b/model/custom_entity_parser/parser/parser_5/parser
index f3eeec5..80588d4 100644
--- a/model/custom_entity_parser/parser/parser_5/parser
+++ b/model/custom_entity_parser/parser/parser_5/parser
diff --git a/model/custom_entity_parser/parser/parser_6/metadata.json b/model/custom_entity_parser/parser/parser_6/metadata.json
new file mode 100644
index 0000000..42c4fe4
--- /dev/null
+++ b/model/custom_entity_parser/parser/parser_6/metadata.json
@@ -0,0 +1 @@
+{"version":"0.8.0","parser_filename":"parser","threshold":1.0,"stop_words":[],"edge_cases":[]}
\ No newline at end of file
diff --git a/model/custom_entity_parser/parser/parser_6/parser b/model/custom_entity_parser/parser/parser_6/parser
new file mode 100644
index 0000000..8493965
--- /dev/null
+++ b/model/custom_entity_parser/parser/parser_6/parser
diff --git a/model/custom_entity_parser/parser/parser_7/metadata.json b/model/custom_entity_parser/parser/parser_7/metadata.json
new file mode 100644
index 0000000..05d57ee
--- /dev/null
+++ b/model/custom_entity_parser/parser/parser_7/metadata.json
@@ -0,0 +1 @@
+{"version":"0.8.0","parser_filename":"parser","threshold":0.8,"stop_words":[],"edge_cases":[]}
\ No newline at end of file
diff --git a/model/custom_entity_parser/parser/parser_7/parser b/model/custom_entity_parser/parser/parser_7/parser
new file mode 100644
index 0000000..d1cf7bd
--- /dev/null
+++ b/model/custom_entity_parser/parser/parser_7/parser
diff --git a/model/custom_entity_parser/parser/parser_8/metadata.json b/model/custom_entity_parser/parser/parser_8/metadata.json
new file mode 100644
index 0000000..42c4fe4
--- /dev/null
+++ b/model/custom_entity_parser/parser/parser_8/metadata.json
@@ -0,0 +1 @@
+{"version":"0.8.0","parser_filename":"parser","threshold":1.0,"stop_words":[],"edge_cases":[]}
\ No newline at end of file
diff --git a/model/custom_entity_parser/parser/parser_8/parser b/model/custom_entity_parser/parser/parser_8/parser
new file mode 100644
index 0000000..c154c14
--- /dev/null
+++ b/model/custom_entity_parser/parser/parser_8/parser
diff --git a/model/custom_entity_parser/parser/parser_9/metadata.json b/model/custom_entity_parser/parser/parser_9/metadata.json
new file mode 100644
index 0000000..05d57ee
--- /dev/null
+++ b/model/custom_entity_parser/parser/parser_9/metadata.json
@@ -0,0 +1 @@
+{"version":"0.8.0","parser_filename":"parser","threshold":0.8,"stop_words":[],"edge_cases":[]}
\ No newline at end of file
diff --git a/model/custom_entity_parser/parser/parser_9/parser b/model/custom_entity_parser/parser/parser_9/parser
new file mode 100644
index 0000000..1990395
--- /dev/null
+++ b/model/custom_entity_parser/parser/parser_9/parser
diff --git a/model/lookup_intent_parser/intent_parser.json b/model/lookup_intent_parser/intent_parser.json
index fbc8d3b..91ed0a9 100644
--- a/model/lookup_intent_parser/intent_parser.json
+++ b/model/lookup_intent_parser/intent_parser.json
@@ -8,9 +8,9 @@
       "entity_scope": {
         "builtin": [],
         "custom": [
-          "to_or_by",
+          "hvac_fan_speed_action",
           "numeric_value",
-          "hvac_fan_speed_action"
+          "to_or_by"
         ]
       },
       "intent_group": [
@@ -21,9 +21,9 @@
       "entity_scope": {
         "builtin": [],
         "custom": [
-          "hvac_temperature_action",
+          "numeric_value",
           "to_or_by",
-          "numeric_value"
+          "hvac_temperature_action"
         ]
       },
       "intent_group": [
@@ -34,6 +34,20 @@
       "entity_scope": {
         "builtin": [],
         "custom": [
+          "media_artist",
+          "media_control_action",
+          "media_album",
+          "media_item"
+        ]
+      },
+      "intent_group": [
+        "MediaControl"
+      ]
+    },
+    {
+      "entity_scope": {
+        "builtin": [],
+        "custom": [
           "to_or_by",
           "numeric_value",
           "volume_control_action"
@@ -47,14 +61,15 @@
   "intents_names": [
     "HVACFanSpeed",
     "HVACTemperature",
+    "MediaControl",
     "VolumeControl"
   ],
   "language_code": "en",
   "map": {
     "-2120605742": [
-      2,
+      3,
       [
-        4
+        8
       ]
     ],
     "-2110319726": [
@@ -74,10 +89,17 @@
         1
       ]
     ],
+    "-2090047260": [
+      3,
+      [
+        8,
+        1
+      ]
+    ],
     "-2069926489": [
-      2,
+      3,
       [
-        4
+        8
       ]
     ],
     "-2053140209": [
@@ -88,10 +110,37 @@
         1
       ]
     ],
-    "-1957537449": [
+    "-2016209332": [
+      2,
+      [
+        4
+      ]
+    ],
+    "-1986897870": [
       2,
       [
         4,
+        5
+      ]
+    ],
+    "-1983949201": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
+    "-1971121225": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
+    "-1957537449": [
+      3,
+      [
+        8,
         2,
         1
       ]
@@ -103,12 +152,38 @@
         0
       ]
     ],
+    "-1926175657": [
+      3,
+      [
+        8
+      ]
+    ],
     "-1863596818": [
       0,
       [
         0
       ]
     ],
+    "-1811738874": [
+      3,
+      [
+        8
+      ]
+    ],
+    "-1777306218": [
+      3,
+      [
+        8,
+        8
+      ]
+    ],
+    "-1739624284": [
+      2,
+      [
+        4,
+        7
+      ]
+    ],
     "-1722292648": [
       0,
       [
@@ -121,6 +196,13 @@
         0
       ]
     ],
+    "-1656935878": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
     "-1647038698": [
       0,
       [
@@ -128,6 +210,26 @@
         0
       ]
     ],
+    "-1601499973": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
+    "-1593349211": [
+      2,
+      [
+        4,
+        5
+      ]
+    ],
+    "-1563917754": [
+      3,
+      [
+        8
+      ]
+    ],
     "-1537473771": [
       1,
       [
@@ -142,12 +244,24 @@
         0
       ]
     ],
+    "-1502025698": [
+      3,
+      [
+        8
+      ]
+    ],
     "-1496609252": [
       0,
       [
         0
       ]
     ],
+    "-1399487879": [
+      3,
+      [
+        8
+      ]
+    ],
     "-1395443273": [
       1,
       [
@@ -155,6 +269,20 @@
         1
       ]
     ],
+    "-1370667029": [
+      3,
+      [
+        8,
+        1
+      ]
+    ],
+    "-1283284216": [
+      3,
+      [
+        8,
+        1
+      ]
+    ],
     "-1230229729": [
       0,
       [
@@ -163,6 +291,14 @@
         1
       ]
     ],
+    "-1191256455": [
+      2,
+      [
+        4,
+        7,
+        6
+      ]
+    ],
     "-1142105109": [
       0,
       [
@@ -170,6 +306,19 @@
         1
       ]
     ],
+    "-1127808664": [
+      3,
+      [
+        8
+      ]
+    ],
+    "-1100138658": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
     "-1099967011": [
       1,
       [
@@ -195,6 +344,21 @@
         1
       ]
     ],
+    "-1081702506": [
+      2,
+      [
+        4,
+        5,
+        7
+      ]
+    ],
+    "-1063167030": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
     "-1062928239": [
       0,
       [
@@ -210,9 +374,9 @@
       ]
     ],
     "-1023112515": [
-      2,
+      3,
       [
-        4
+        8
       ]
     ],
     "-997492224": [
@@ -229,24 +393,30 @@
         1
       ]
     ],
+    "-965073122": [
+      3,
+      [
+        8
+      ]
+    ],
     "-943547658": [
-      2,
+      3,
       [
-        4,
+        8,
         2,
         1
       ]
     ],
     "-875246525": [
-      2,
+      3,
       [
-        4
+        8
       ]
     ],
     "-869188155": [
-      2,
+      3,
       [
-        4
+        8
       ]
     ],
     "-831404964": [
@@ -258,9 +428,9 @@
       ]
     ],
     "-817807979": [
-      2,
+      3,
       [
-        4,
+        8,
         2,
         1
       ]
@@ -279,24 +449,44 @@
         1
       ]
     ],
+    "-725517004": [
+      3,
+      [
+        8
+      ]
+    ],
     "-677396479": [
-      2,
+      3,
       [
-        4,
+        8,
         2,
         1
       ]
     ],
+    "-674239471": [
+      2,
+      [
+        4,
+        6
+      ]
+    ],
     "-637651705": [
       0,
       [
         0
       ]
     ],
-    "-499365884": [
+    "-600081753": [
       2,
       [
         4,
+        5
+      ]
+    ],
+    "-499365884": [
+      3,
+      [
+        8,
         2,
         1
       ]
@@ -310,9 +500,16 @@
       ]
     ],
     "-312867293": [
+      3,
+      [
+        8
+      ]
+    ],
+    "-255167248": [
       2,
       [
-        4
+        4,
+        6
       ]
     ],
     "-220062178": [
@@ -322,10 +519,39 @@
         1
       ]
     ],
+    "-217922386": [
+      3,
+      [
+        8,
+        2,
+        1
+      ]
+    ],
+    "-216262037": [
+      3,
+      [
+        8
+      ]
+    ],
     "-211838140": [
-      2,
+      3,
       [
-        4
+        8
+      ]
+    ],
+    "-204266952": [
+      3,
+      [
+        8,
+        8
+      ]
+    ],
+    "-196312316": [
+      3,
+      [
+        8,
+        2,
+        1
       ]
     ],
     "-174212851": [
@@ -334,10 +560,31 @@
         0
       ]
     ],
-    "-55279385": [
+    "-174003183": [
       2,
       [
-        4
+        4,
+        5,
+        6
+      ]
+    ],
+    "-113429679": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
+    "-70339040": [
+      3,
+      [
+        8
+      ]
+    ],
+    "-55279385": [
+      3,
+      [
+        8
       ]
     ],
     "-53269527": [
@@ -348,6 +595,14 @@
         1
       ]
     ],
+    "-46625472": [
+      3,
+      [
+        8,
+        2,
+        1
+      ]
+    ],
     "-13548888": [
       0,
       [
@@ -360,6 +615,20 @@
         0
       ]
     ],
+    "110907070": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
+    "145387958": [
+      2,
+      [
+        4,
+        6
+      ]
+    ],
     "191080872": [
       0,
       [
@@ -377,9 +646,9 @@
       ]
     ],
     "255811183": [
-      2,
+      3,
       [
-        4
+        8
       ]
     ],
     "257368321": [
@@ -389,6 +658,25 @@
         1
       ]
     ],
+    "287509561": [
+      2,
+      [
+        4
+      ]
+    ],
+    "314901221": [
+      3,
+      [
+        8
+      ]
+    ],
+    "387953805": [
+      3,
+      [
+        8,
+        8
+      ]
+    ],
     "391606162": [
       0,
       [
@@ -409,6 +697,18 @@
         1
       ]
     ],
+    "495949219": [
+      3,
+      [
+        8
+      ]
+    ],
+    "526898705": [
+      3,
+      [
+        8
+      ]
+    ],
     "561946482": [
       1,
       [
@@ -417,6 +717,13 @@
         1
       ]
     ],
+    "572252578": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
     "660616696": [
       0,
       [
@@ -425,6 +732,13 @@
         1
       ]
     ],
+    "689957073": [
+      2,
+      [
+        4,
+        7
+      ]
+    ],
     "694845309": [
       0,
       [
@@ -437,6 +751,14 @@
         0
       ]
     ],
+    "751311249": [
+      3,
+      [
+        8,
+        2,
+        1
+      ]
+    ],
     "757039917": [
       1,
       [
@@ -445,6 +767,13 @@
         1
       ]
     ],
+    "761577774": [
+      3,
+      [
+        8,
+        8
+      ]
+    ],
     "783225393": [
       1,
       [
@@ -462,10 +791,30 @@
         1
       ]
     ],
-    "906678378": [
+    "833498327": [
       2,
       [
-        4
+        4,
+        7
+      ]
+    ],
+    "903831129": [
+      2,
+      [
+        4,
+        5
+      ]
+    ],
+    "903855712": [
+      3,
+      [
+        8
+      ]
+    ],
+    "906678378": [
+      3,
+      [
+        8
       ]
     ],
     "930023264": [
@@ -482,10 +831,17 @@
         1
       ]
     ],
+    "970511704": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
     "975749138": [
-      2,
+      3,
       [
-        4
+        8
       ]
     ],
     "1030701586": [
@@ -494,6 +850,28 @@
         0
       ]
     ],
+    "1072119371": [
+      3,
+      [
+        8,
+        2,
+        1
+      ]
+    ],
+    "1076747108": [
+      3,
+      [
+        8,
+        2,
+        1
+      ]
+    ],
+    "1085293117": [
+      3,
+      [
+        8
+      ]
+    ],
     "1104536743": [
       1,
       [
@@ -508,10 +886,10 @@
       ]
     ],
     "1157458478": [
-      2,
+      3,
       [
         2,
-        4,
+        8,
         2,
         1
       ]
@@ -525,9 +903,9 @@
       ]
     ],
     "1290653223": [
-      2,
+      3,
       [
-        4
+        8
       ]
     ],
     "1297220448": [
@@ -545,17 +923,23 @@
       ]
     ],
     "1492652257": [
-      2,
+      3,
       [
-        4,
+        8,
         2,
         1
       ]
     ],
-    "1496252339": [
+    "1495699539": [
       2,
       [
-        4,
+        4
+      ]
+    ],
+    "1496252339": [
+      3,
+      [
+        8,
         2,
         1
       ]
@@ -567,10 +951,24 @@
         1
       ]
     ],
+    "1554239151": [
+      3,
+      [
+        8,
+        1
+      ]
+    ],
     "1585809905": [
+      3,
+      [
+        8
+      ]
+    ],
+    "1586796129": [
       2,
       [
-        4
+        4,
+        5
       ]
     ],
     "1622708267": [
@@ -601,15 +999,55 @@
       ]
     ],
     "1735335116": [
+      3,
+      [
+        8
+      ]
+    ],
+    "1803354715": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
+    "1807725035": [
       2,
       [
-        4
+        4,
+        5
+      ]
+    ],
+    "1813438653": [
+      3,
+      [
+        8,
+        1
+      ]
+    ],
+    "1837641218": [
+      3,
+      [
+        8
+      ]
+    ],
+    "1863687538": [
+      3,
+      [
+        8,
+        1
       ]
     ],
     "1868997662": [
-      2,
+      3,
       [
-        4
+        8
+      ]
+    ],
+    "1870349904": [
+      3,
+      [
+        8
       ]
     ],
     "1934565841": [
@@ -620,6 +1058,34 @@
         1
       ]
     ],
+    "1940761143": [
+      3,
+      [
+        2,
+        1
+      ]
+    ],
+    "1991541466": [
+      2,
+      [
+        4,
+        5
+      ]
+    ],
+    "2032298459": [
+      3,
+      [
+        8,
+        1
+      ]
+    ],
+    "2044767139": [
+      2,
+      [
+        4,
+        6
+      ]
+    ],
     "2067820512": [
       0,
       [
@@ -627,6 +1093,13 @@
         0
       ]
     ],
+    "2092780366": [
+      2,
+      [
+        4,
+        5
+      ]
+    ],
     "2098059784": [
       0,
       [
@@ -639,6 +1112,10 @@
     "numeric_value",
     "to_or_by",
     "hvac_temperature_action",
+    "media_control_action",
+    "media_item",
+    "media_artist",
+    "media_album",
     "volume_control_action"
   ],
   "stop_words_whitelist": {
diff --git a/model/nlu_engine.json b/model/nlu_engine.json
index 1c8a4dd..70b2fab 100644
--- a/model/nlu_engine.json
+++ b/model/nlu_engine.json
@@ -203,6 +203,18 @@
       "hvac_temperature_action": {
         "automatically_extensible": false
       },
+      "media_album": {
+        "automatically_extensible": true
+      },
+      "media_artist": {
+        "automatically_extensible": true
+      },
+      "media_control_action": {
+        "automatically_extensible": false
+      },
+      "media_item": {
+        "automatically_extensible": true
+      },
       "numeric_value": {
         "automatically_extensible": false
       },
@@ -225,6 +237,12 @@
         "numeric_value": "numeric_value",
         "to_or_by": "to_or_by"
       },
+      "MediaControl": {
+        "media_album": "media_album",
+        "media_artist": "media_artist",
+        "media_control_action": "media_control_action",
+        "media_item": "media_item"
+      },
       "VolumeControl": {
         "numeric_value": "numeric_value",
         "to_or_by": "to_or_by",
diff --git a/model/probabilistic_intent_parser/intent_classifier/featurizer/tfidf_vectorizer/vectorizer.json b/model/probabilistic_intent_parser/intent_classifier/featurizer/tfidf_vectorizer/vectorizer.json
index ddd3858..da90955 100644
--- a/model/probabilistic_intent_parser/intent_classifier/featurizer/tfidf_vectorizer/vectorizer.json
+++ b/model/probabilistic_intent_parser/intent_classifier/featurizer/tfidf_vectorizer/vectorizer.json
@@ -8,224 +8,314 @@
   "language_code": "en",
   "vectorizer": {
     "idf_diag": [
-      5.945207488773801,
-      5.945207488773801,
-      5.945207488773801,
-      5.945207488773801,
-      5.539742380665636,
-      5.945207488773801,
-      5.945207488773801,
-      5.945207488773801,
-      5.945207488773801,
-      2.7671536584258547,
-      4.441130091997526,
-      5.539742380665636,
-      5.2520603082138555,
-      3.693915690167305,
-      5.028916756899646,
-      3.9992973397184874,
-      5.539742380665636,
-      4.846595200105691,
-      4.692444520278432,
-      5.539742380665636,
-      3.1726187665340193,
-      3.693915690167305,
-      5.028916756899646,
-      4.1534480195457455,
-      4.3357695763397,
-      5.539742380665636,
-      5.945207488773801,
-      5.945207488773801,
-      5.539742380665636,
-      4.240459396535375,
-      5.2520603082138555,
-      4.441130091997526,
-      3.2371572876715904,
-      5.539742380665636,
-      4.3357695763397,
-      5.945207488773801,
-      5.028916756899646,
-      2.0636436908303626,
-      1.9843943191762223,
-      2.4336620499427797,
-      2.334289576129576,
-      2.172446550679162,
-      4.558913127653909,
-      3.2043674648485996,
-      5.2520603082138555,
-      4.692444520278432,
-      5.539742380665636,
-      5.2520603082138555,
-      5.945207488773801,
-      5.945207488773801,
-      4.558913127653909,
-      5.945207488773801,
-      3.502860453404596,
-      4.441130091997526,
-      5.2520603082138555,
-      3.502860453404596,
-      4.558913127653909,
-      5.945207488773801,
-      4.240459396535375,
-      5.028916756899646,
-      5.2520603082138555,
-      4.558913127653909,
-      4.558913127653909,
-      5.945207488773801,
-      5.945207488773801,
-      5.2520603082138555,
-      5.945207488773801,
-      4.692444520278432,
-      5.2520603082138555,
-      3.2043674648485996,
-      3.8657659470939647,
-      5.539742380665636,
-      5.945207488773801,
-      3.502860453404596,
-      4.692444520278432,
-      5.539742380665636,
-      5.539742380665636,
-      4.3357695763397,
-      4.558913127653909,
-      5.945207488773801,
-      4.441130091997526,
-      4.692444520278432,
-      4.846595200105691,
-      4.558913127653909,
-      5.945207488773801,
-      5.539742380665636,
-      4.240459396535375,
-      3.4603008389858,
-      5.539742380665636,
-      3.502860453404596,
-      1.6755100390738384,
-      5.539742380665636,
-      4.692444520278432,
-      5.028916756899646,
-      2.854165035415485,
-      5.2520603082138555,
-      5.945207488773801,
-      4.558913127653909,
-      5.945207488773801,
-      4.3357695763397,
-      4.240459396535375,
-      5.945207488773801,
-      3.693915690167305,
-      4.692444520278432,
-      5.2520603082138555,
-      5.945207488773801,
-      4.692444520278432,
-      3.2710588393472717
+      4.856510295497888,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      5.549657476057832,
+      4.856510295497888,
+      6.465948207931988,
+      5.772801027372043,
+      6.0604830998238235,
+      4.9618708111557135,
+      5.549657476057832,
+      5.772801027372043,
+      3.9810415581439873,
+      6.0604830998238235,
+      5.21318523943662,
+      5.772801027372043,
+      6.465948207931988,
+      6.465948207931988,
+      4.520038058876674,
+      6.0604830998238235,
+      4.674188738703933,
+      5.549657476057832,
+      6.0604830998238235,
+      5.21318523943662,
+      4.9618708111557135,
+      3.0159606621004005,
+      3.791799558505459,
+      5.549657476057832,
+      4.674188738703933,
+      4.594146031030396,
+      6.465948207931988,
+      6.0604830998238235,
+      6.465948207931988,
+      6.0604830998238235,
+      5.772801027372043,
+      6.465948207931988,
+      6.465948207931988,
+      4.268723630595768,
+      5.079653846812097,
+      6.0604830998238235,
+      4.594146031030396,
+      3.7578980068297776,
+      5.772801027372043,
+      4.674188738703933,
+      5.772801027372043,
+      6.0604830998238235,
+      5.367335919263878,
+      5.367335919263878,
+      2.148460094395677,
+      2.1754887667835963,
+      4.520038058876674,
+      5.079653846812097,
+      3.662587827025453,
+      3.900998850470451,
+      2.458615022699517,
+      2.2992829841302607,
+      2.0531499145913523,
+      5.079653846812097,
+      3.725108184006787,
+      5.772801027372043,
+      5.367335919263878,
+      4.856510295497888,
+      5.21318523943662,
+      6.0604830998238235,
+      5.549657476057832,
+      5.079653846812097,
+      4.594146031030396,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      5.079653846812097,
+      6.465948207931988,
+      6.0604830998238235,
+      5.21318523943662,
+      3.863258522487604,
+      3.9402195636237325,
+      4.674188738703933,
+      5.772801027372043,
+      3.863258522487604,
+      4.9618708111557135,
+      6.465948207931988,
+      4.594146031030396,
+      5.21318523943662,
+      4.594146031030396,
+      4.325882044435717,
+      6.465948207931988,
+      5.772801027372043,
+      6.465948207931988,
+      4.9618708111557135,
+      5.367335919263878,
+      5.367335919263878,
+      5.549657476057832,
+      4.9618708111557135,
+      5.079653846812097,
+      5.772801027372043,
+      3.5215092287655474,
+      5.079653846812097,
+      6.0604830998238235,
+      3.352432898721613,
+      6.0604830998238235,
+      6.0604830998238235,
+      6.465948207931988,
+      6.465948207931988,
+      5.549657476057832,
+      3.6933594856922065,
+      5.21318523943662,
+      5.549657476057832,
+      5.21318523943662,
+      4.674188738703933,
+      5.772801027372043,
+      4.594146031030396,
+      6.0604830998238235,
+      6.0604830998238235,
+      6.465948207931988,
+      6.465948207931988,
+      4.268723630595768,
+      4.856510295497888,
+      4.9618708111557135,
+      4.9618708111557135,
+      4.761200115693562,
+      6.465948207931988,
+      6.0604830998238235,
+      5.367335919263878,
+      3.330453992002838,
+      3.9810415581439873,
+      6.465948207931988,
+      6.465948207931988,
+      6.465948207931988,
+      6.0604830998238235,
+      4.023601172562783,
+      1.6416424920272252,
+      6.0604830998238235,
+      5.21318523943662,
+      5.21318523943662,
+      2.910600146442574,
+      5.772801027372043,
+      5.079653846812097,
+      4.520038058876674,
+      4.9618708111557135,
+      4.451045187389723,
+      6.465948207931988,
+      3.0482215243186217,
+      5.549657476057832,
+      5.772801027372043,
+      6.465948207931988,
+      5.21318523943662,
+      3.330453992002838
     ],
     "vocab": {
-      "19": 0,
-      "41": 1,
-      "51": 2,
-      "52": 3,
-      "58": 4,
-      "60": 5,
-      "76": 6,
-      "81": 7,
-      "94": 8,
-      "a": 9,
-      "adjust": 10,
-      "airflow": 11,
-      "amp": 12,
-      "and": 13,
-      "back": 14,
-      "bit": 15,
-      "blower": 16,
-      "boost": 17,
-      "boosting": 18,
-      "breezy": 19,
-      "by": 20,
-      "can": 21,
-      "cars": 22,
-      "celsius": 23,
-      "change": 24,
-      "circulation": 25,
-      "cold": 26,
-      "colder": 27,
-      "cool": 28,
-      "could": 29,
-      "crank": 30,
-      "decrease": 31,
-      "degrees": 32,
-      "dial": 33,
-      "down": 34,
-      "eight": 35,
-      "eighty": 36,
-      "entityfeaturehvac_fan_speed_action": 37,
-      "entityfeaturehvac_temperature_action": 38,
-      "entityfeaturenumeric_value": 39,
-      "entityfeatureto_or_by": 40,
-      "entityfeaturevolume_control_action": 41,
-      "fahrenheit": 42,
-      "fan": 43,
-      "fans": 44,
-      "fifty": 45,
-      "five": 46,
-      "four": 47,
-      "fully": 48,
-      "heat": 49,
-      "hey": 50,
-      "hot": 51,
-      "i": 52,
-      "increase": 53,
-      "intensity": 54,
-      "it": 55,
-      "its": 56,
-      "just": 57,
-      "lets": 58,
-      "little": 59,
-      "louder": 60,
-      "lower": 61,
-      "make": 62,
-      "max": 63,
-      "maybe": 64,
-      "need": 65,
-      "nineteen": 66,
-      "ninety": 67,
-      "notch": 68,
-      "of": 69,
-      "percent": 70,
-      "performance": 71,
-      "place": 72,
-      "please": 73,
-      "power": 74,
-      "quarters": 75,
-      "quieter": 76,
-      "raise": 77,
-      "reduce": 78,
-      "room": 79,
-      "set": 80,
-      "seven": 81,
-      "seventy": 82,
-      "six": 83,
-      "slightly": 84,
-      "slow": 85,
-      "sound": 86,
-      "speed": 87,
-      "tad": 88,
-      "temperature": 89,
-      "the": 90,
-      "thermostat": 91,
-      "thirty": 92,
-      "three": 93,
-      "to": 94,
-      "too": 95,
-      "touch": 96,
-      "turn": 97,
-      "twenty": 98,
-      "two": 99,
-      "up": 100,
-      "ventilation": 101,
-      "volume": 102,
-      "want": 103,
-      "warmer": 104,
-      "warmth": 105,
-      "would": 106,
-      "you": 107
+      "%": 0,
+      "28": 1,
+      "30": 2,
+      "33": 3,
+      "36": 4,
+      "4": 5,
+      "59": 6,
+      "73": 7,
+      "76": 8,
+      "78": 9,
+      "?": 10,
+      "adjust": 11,
+      "advance": 12,
+      "air": 13,
+      "airflow": 14,
+      "album": 15,
+      "alter": 16,
+      "amp": 17,
+      "and": 18,
+      "artist": 19,
+      "back": 20,
+      "band": 21,
+      "begin": 22,
+      "better": 23,
+      "bit": 24,
+      "blower": 25,
+      "boost": 26,
+      "boosting": 27,
+      "breezy": 28,
+      "bring": 29,
+      "bump": 30,
+      "by": 31,
+      "can": 32,
+      "cars": 33,
+      "celsius": 34,
+      "change": 35,
+      "chilly": 36,
+      "circulation": 37,
+      "cold": 38,
+      "colder": 39,
+      "continue": 40,
+      "cool": 41,
+      "cooling": 42,
+      "could": 43,
+      "crank": 44,
+      "current": 45,
+      "decrease": 46,
+      "degrees": 47,
+      "dial": 48,
+      "down": 49,
+      "drop": 50,
+      "earlier": 51,
+      "eight": 52,
+      "eighty": 53,
+      "entityfeaturehvac_fan_speed_action": 54,
+      "entityfeaturehvac_temperature_action": 55,
+      "entityfeaturemedia_album": 56,
+      "entityfeaturemedia_artist": 57,
+      "entityfeaturemedia_control_action": 58,
+      "entityfeaturemedia_item": 59,
+      "entityfeaturenumeric_value": 60,
+      "entityfeatureto_or_by": 61,
+      "entityfeaturevolume_control_action": 62,
+      "fahrenheit": 63,
+      "fan": 64,
+      "fans": 65,
+      "fifty": 66,
+      "five": 67,
+      "forty": 68,
+      "forward": 69,
+      "four": 70,
+      "fourty": 71,
+      "from": 72,
+      "fully": 73,
+      "halfway": 74,
+      "heat": 75,
+      "hey": 76,
+      "hike": 77,
+      "hold": 78,
+      "how": 79,
+      "i": 80,
+      "in": 81,
+      "increase": 82,
+      "intensity": 83,
+      "it": 84,
+      "its": 85,
+      "jack": 86,
+      "lets": 87,
+      "louder": 88,
+      "lower": 89,
+      "make": 90,
+      "maybe": 91,
+      "me": 92,
+      "moment": 93,
+      "move": 94,
+      "music": 95,
+      "need": 96,
+      "next": 97,
+      "nine": 98,
+      "ninety": 99,
+      "notch": 100,
+      "of": 101,
+      "one": 102,
+      "pause": 103,
+      "percent": 104,
+      "performance": 105,
+      "performer": 106,
+      "place": 107,
+      "play": 108,
+      "playlist": 109,
+      "please": 110,
+      "power": 111,
+      "previous": 112,
+      "quieter": 113,
+      "raise": 114,
+      "record": 115,
+      "reduce": 116,
+      "resume": 117,
+      "rewind": 118,
+      "room": 119,
+      "scale": 120,
+      "set": 121,
+      "seven": 122,
+      "seventy": 123,
+      "six": 124,
+      "sixty": 125,
+      "skip": 126,
+      "slow": 127,
+      "song": 128,
+      "sound": 129,
+      "speed": 130,
+      "start": 131,
+      "step": 132,
+      "stifling": 133,
+      "stop": 134,
+      "temperature": 135,
+      "the": 136,
+      "thermostat": 137,
+      "thirty": 138,
+      "time": 139,
+      "to": 140,
+      "too": 141,
+      "track": 142,
+      "turn": 143,
+      "twenty": 144,
+      "up": 145,
+      "ventilation": 146,
+      "volume": 147,
+      "warm": 148,
+      "warmer": 149,
+      "warmth": 150,
+      "would": 151,
+      "you": 152
     }
   }
 }
\ No newline at end of file
diff --git a/model/probabilistic_intent_parser/intent_classifier/intent_classifier.json b/model/probabilistic_intent_parser/intent_classifier/intent_classifier.json
index 99b9b43..f840c51 100644
--- a/model/probabilistic_intent_parser/intent_classifier/intent_classifier.json
+++ b/model/probabilistic_intent_parser/intent_classifier/intent_classifier.json
@@ -1,444 +1,779 @@
 {
   "coeffs": [
     [
-      -0.1944949449301576,
-      -0.1709338192954452,
-      -0.14643812047639607,
-      -0.19155332343920425,
-      -0.26203322806132484,
-      -0.06998595404922413,
-      -0.04616537127036657,
-      -0.09593063108159781,
-      0.2670801970940651,
-      -0.7298972094796787,
-      1.1659021913188135,
-      1.7720959799070886,
-      1.9152793569447697,
-      -1.4696163121979995,
-      0.844395355117868,
-      0.5986654133092939,
-      1.3286721862827426,
-      0.4202051337048011,
-      1.8605029993612292,
-      0.4864392153709908,
-      -0.1850026065080545,
-      0.8315065579668949,
-      -0.4071500143626975,
-      -0.6911096635942332,
-      0.33280464670368676,
-      0.6895857907703777,
-      -0.33975347056860383,
-      -0.03409610336971599,
-      -0.1830205262812737,
-      -0.18959221713492214,
-      0.8863962066067318,
-      0.06351256100095176,
-      -1.9265904348973653,
-      0.4031686676411473,
-      0.20750138598813397,
-      -0.11880557452018371,
-      -0.551474327699674,
-      2.8802191640954495,
-      1.3603631129630487,
-      -0.7488685456543981,
-      -0.887369753407331,
-      1.2416104378407142,
-      -0.6426741128019834,
-      6.090534677887493,
-      2.051176967856325,
-      0.04897224563640065,
-      -0.5042980260523056,
-      -0.29850146748587314,
-      -0.2065434866677535,
-      -0.04002489365435418,
-      0.5406886147155344,
-      -0.15356240192823065,
-      0.25376821068531363,
-      -0.30572033754692146,
-      1.7562240056899052,
-      0.15126443772552664,
-      1.6638008729301035,
-      -0.07372959362232727,
-      2.932710325008,
-      1.4239481274944663,
-      -0.46789548560291827,
-      0.31995310111072084,
-      -1.3492128438591617,
-      -0.12568501546613994,
-      -0.06998595404922413,
-      1.7679849531700071,
-      -0.21155141956582602,
-      -0.3088181546815536,
-      0.956077467622598,
-      -1.9114985317889572,
-      1.229239065917747,
-      0.9249469840479404,
-      -0.3498944896366811,
-      0.6503093350916289,
-      0.85981654702734,
-      0.5197910668573862,
-      -0.46524667806075454,
-      0.375233322684959,
-      0.7205348268191379,
-      -0.09593063108159781,
-      -0.7997164507929231,
-      -0.026335878116654075,
-      -0.5427886279639856,
-      0.2551556850123977,
-      -0.40450344187720044,
-      0.708709387300732,
-      -2.1052525890518363,
-      4.7731182137937385,
-      0.3827988890934132,
-      -1.6931132062614114,
-      -1.8036556963730381,
-      -0.2804552388335083,
-      -0.1652470817695098,
-      0.44514380577026275,
-      -0.9185652404792951,
-      0.3255194621979477,
-      -0.07372959362232727,
-      0.020183885272701797,
-      -0.05895361676374134,
-      -1.000175188982346,
-      1.1758401718339109,
-      0.9496473146457145,
-      -2.8253317944196823,
-      0.9097819033258351,
-      -0.13074043514374561,
-      -0.1416950074360412,
-      1.6868101184990176,
-      -0.3008520671626627
+      -0.26768334807980576,
+      -0.18431984915897026,
+      -0.1157974787500591,
+      -0.04985747090634133,
+      0.47377184067174527,
+      -0.07373425850962399,
+      -0.08949314149376576,
+      0.3307456656133812,
+      -0.06225820449079473,
+      -0.05409320887851551,
+      -0.16260749638034722,
+      0.37136939433377947,
+      -0.04451627897099467,
+      0.4737487085380406,
+      2.544890104148038,
+      -0.47171318147093355,
+      -0.13139661038146683,
+      2.1836072088204066,
+      -1.3176204681982386,
+      -0.10294282594377573,
+      1.5112938769228015,
+      -0.11864291804693093,
+      -0.06350373528982037,
+      0.8717903281769723,
+      0.8652766507771181,
+      1.7049285562029795,
+      0.5526040964730556,
+      0.9836867820258448,
+      0.4628473592229024,
+      -0.31165889072681474,
+      -0.25172889800676124,
+      -0.3074634435594043,
+      0.8273586123579448,
+      -0.22933669644729185,
+      -0.589804953637284,
+      0.8014259075275285,
+      0.7999821795734068,
+      1.0225578157550712,
+      -0.31366147058591676,
+      -0.21804656516992638,
+      -0.32697170204690584,
+      -0.05409320887851551,
+      1.3254272424825584,
+      -0.14796325504695043,
+      0.7879462108857146,
+      -0.33212216254632404,
+      -0.3189762066144843,
+      -1.6108819129739274,
+      0.37451835071228406,
+      0.4684028657758377,
+      -0.1280054123928272,
+      -0.10995166645211746,
+      -0.31371406753501463,
+      -0.4387599683718617,
+      2.1070508007754953,
+      2.4234553766629707,
+      -0.7923860211323095,
+      -0.3498295976508332,
+      -0.14641552473739344,
+      -1.118325345297441,
+      -1.0022327985241617,
+      -0.8881821392286897,
+      0.44836167202135435,
+      -0.46350821028705524,
+      7.278263385139301,
+      2.631470374792341,
+      -0.3640990961827003,
+      -0.29586473164686566,
+      0.00810073339910888,
+      -0.08049875697810281,
+      -0.2151797282239119,
+      0.2967059570695886,
+      -0.9813217844161468,
+      -0.08342818205033442,
+      -0.07585935053002046,
+      -0.03761381345163309,
+      0.9478536957856585,
+      0.8620594995404826,
+      -0.09677553390910511,
+      1.0644689270348244,
+      0.9519367175160602,
+      -1.1539746317850925,
+      -0.2841632550857123,
+      1.8356370797880865,
+      0.6691194583047485,
+      1.923894016872845,
+      0.6323583134938597,
+      3.748473202059713,
+      -0.4062887943974518,
+      1.5585192501995677,
+      -0.9300708097872277,
+      -0.1157974787500591,
+      1.1107244174233744,
+      0.696056680097096,
+      -0.29085784962504624,
+      -0.3529262988150278,
+      1.7950562542652315,
+      -0.3064737459615936,
+      0.06588875658079339,
+      -0.34322466038429045,
+      1.3925253757880676,
+      -1.7544251042403514,
+      -0.4741373937917036,
+      -0.10805344405798573,
+      0.5688064059792672,
+      1.257476299705986,
+      -0.18987991687738612,
+      -0.3109319096407502,
+      -0.058615069775907705,
+      -0.25190809719093704,
+      0.8261669892329724,
+      1.2101852213760822,
+      -0.17745819472918115,
+      -0.44697044618522236,
+      -0.02206794721021326,
+      -0.20115851419580463,
+      0.0024568769280896765,
+      -0.16151220397300536,
+      -0.09341987455188062,
+      -0.08949314149376576,
+      1.1723970858792843,
+      -0.44774341895052056,
+      -0.33763179870401605,
+      -0.2268276574755049,
+      -0.13294915444914762,
+      -0.57998115851003,
+      -0.03878100684390338,
+      0.8093990916268565,
+      -0.25738483868576617,
+      -2.7980475103313984,
+      5.648771505964587,
+      -0.06514603099448765,
+      0.3035484640957666,
+      1.232342549555049,
+      -0.2236484841522893,
+      -1.1641918932859687,
+      -1.7054745092268269,
+      -0.16721725821190173,
+      0.027305014365856223,
+      0.6769429238141756,
+      -0.8276033303337725,
+      0.3489406981328888,
+      -0.3957084259048736,
+      0.06824875273167176,
+      0.18538239711577387,
+      0.7090045834816223,
+      1.4164862060252539,
+      -3.828217077947122,
+      0.07211637900015036,
+      -0.2573440768354599,
+      -0.10934390701824966,
+      2.1670472378718926,
+      -0.44020463286006295
     ],
     [
-      0.39070411072369365,
-      -0.2103151585229938,
-      0.7988194021633298,
-      -0.1752420388174099,
-      0.5359507584882811,
-      0.7428763997929889,
-      0.158855764775961,
-      0.2233411968906852,
-      -0.07370269321628466,
-      -1.8353538915479386,
-      -0.24029799505652064,
-      -0.28662267645598494,
-      -0.3595115590220648,
-      -1.4249662264232048,
-      0.11414120061471919,
-      0.6253185197288007,
-      -0.2993603475100838,
-      0.6557637418838415,
-      0.3557014021981265,
-      -0.15358862121789965,
-      0.3548887422294314,
-      -0.15059374956989222,
-      1.5206949602597781,
-      2.6928307913975673,
-      0.08170193267068891,
-      -0.14869989550318333,
-      0.4508426407687237,
-      0.1707324925480857,
-      0.8886483462270193,
-      -0.340606576471467,
-      -0.38710229891410747,
-      0.44320048583521526,
-      7.196444715206654,
-      -0.2916192200060449,
-      0.21640722331701634,
-      0.45040301271625116,
-      0.9377763049112277,
-      0.8755178498002804,
-      0.8196061708389681,
-      1.5703298809444148,
-      0.042469682467589566,
-      0.2521622290502533,
-      2.2729408186528097,
-      -1.700989160194387,
-      -0.4170959874909554,
-      0.2167315857669742,
-      0.7867573286977338,
-      0.21162593666759807,
-      -0.17343424391911377,
-      0.14752130265412475,
-      -0.8154556074367001,
-      0.35069944086042243,
-      -1.324150568310463,
-      -0.6866034300206799,
-      -0.2935693407558982,
-      -1.0602676540273166,
-      -0.008528396235158536,
-      -0.07722958177613383,
-      0.017356583477958265,
-      -0.321385951211114,
-      -0.23155135203451066,
-      0.5110182231127964,
-      0.06205537096880271,
-      0.3442555505181098,
-      0.7428763997929889,
-      -0.22909500623352944,
-      -0.16504042772830033,
-      0.3303233868986131,
-      -0.3757524399605448,
-      -2.014770165348239,
-      -1.1481428689082491,
-      -0.31018813997890854,
-      0.9788137882293648,
-      -0.35081262993291046,
-      -0.6948026076004692,
-      -0.14819138439352864,
-      -0.16781881301697193,
-      0.6394955144239772,
-      -0.13242339035433284,
-      0.2233411968906852,
-      -0.18916092326450623,
-      0.30974673539675396,
-      1.2905678974554733,
-      0.8320047276962229,
-      -0.11020113224991683,
-      -0.18016743766145368,
-      -1.448445553920027,
-      -1.4810766380709515,
-      -0.25049837150446247,
-      5.344480236722493,
-      -1.7977164071838685,
-      1.2292488846986476,
-      0.8556173004283408,
-      -0.36730614081727125,
-      -0.26733833583392214,
-      0.1641989880763703,
-      -0.07722958177613383,
-      -0.06562764593404344,
-      0.24183362545327178,
-      -0.08261514995386539,
-      0.18092959776267203,
-      -0.28158672716472694,
-      -1.7142914600779355,
-      0.1503396968334292,
-      0.8915786935223018,
-      0.827469912009148,
-      -0.4147546405943871,
-      -0.5545769283716919
+      -0.5944262959792576,
+      1.2579996668595468,
+      0.6867340787493023,
+      0.23952744491803077,
+      -0.037911320711402755,
+      0.5023774265443904,
+      0.2801130988325825,
+      -0.053533040248773145,
+      0.4524670784328211,
+      0.25538003552000066,
+      -0.12201398634374877,
+      -0.2065999361379249,
+      -0.05840518822194708,
+      -0.3708615681759723,
+      -0.2206613591386743,
+      -0.30207637484512045,
+      -0.16245479300497423,
+      -0.1814124325200278,
+      -1.292397902805038,
+      -0.09638294256045019,
+      0.05328627809666787,
+      -0.11938079283005501,
+      -0.03586122251771167,
+      -0.1417155469623438,
+      0.7068981054304491,
+      -0.15794447238858506,
+      0.09689172795865225,
+      0.7488915383904293,
+      -0.09211169336608828,
+      -0.2718196765128124,
+      -0.3703656972831981,
+      0.27428609867472215,
+      -0.2559667923494846,
+      1.8570196000293995,
+      3.022819705807494,
+      -0.11162678215653156,
+      -0.22853585053719241,
+      -0.09692201592263339,
+      0.647329882414934,
+      1.7907346788445577,
+      -0.23248919959904046,
+      0.25538003552000066,
+      -0.09091191087910545,
+      -0.4422791957991807,
+      -0.45505226179074154,
+      -0.3167952500283189,
+      0.14266964979050753,
+      8.57861283924471,
+      -0.25909587474778945,
+      0.28396375095982695,
+      -0.18145361743175428,
+      -0.09925944530212999,
+      0.29541653348010166,
+      0.7683644844500286,
+      0.49479236502778856,
+      1.824964332448494,
+      -0.6091452178519737,
+      -0.29297621176651595,
+      -0.8993505915337188,
+      -0.8342811538843671,
+      0.5852017177756001,
+      0.10115330816610245,
+      -0.46987629280799986,
+      2.655793859480815,
+      -1.2137835872454164,
+      -0.38167497139022466,
+      0.39569529777361895,
+      0.3977529249732144,
+      0.8398523644552952,
+      -0.06987910573025526,
+      0.046023398001951106,
+      0.34062660170061865,
+      -0.9292601430979066,
+      0.34158762574031354,
+      0.6196021026150311,
+      0.15964651647828856,
+      -0.6153360729805879,
+      -0.12870526282505673,
+      -0.1004079228472231,
+      -0.5228740822999282,
+      -1.0089201573133086,
+      -1.410047529221162,
+      -0.5733601049486935,
+      -0.2759599264104546,
+      -0.9198150421407457,
+      0.1523714779970628,
+      -0.08814717416504475,
+      0.46373516911810664,
+      -0.3699720385844527,
+      0.0041773916940671015,
+      0.3854496733156296,
+      0.6867340787493023,
+      -0.20618182609286012,
+      -0.180654381367278,
+      -0.3717964076854691,
+      -0.24657905886198342,
+      -0.22290522208017563,
+      -0.23912051871001763,
+      0.026128385951766562,
+      0.6688056791912609,
+      -0.3954441534889584,
+      -1.667803779914169,
+      0.8256358223031023,
+      -0.097226467634265,
+      -1.533347839757153,
+      -0.12924180317828896,
+      -0.12783396042596917,
+      1.4075295778663501,
+      -0.044207482146367515,
+      -0.17557467488240147,
+      -0.23312709149654487,
+      -0.6051600073629133,
+      -0.14902784371827776,
+      -0.3233112210763292,
+      0.2794018407184042,
+      -0.24389475254853885,
+      0.27483165635790807,
+      -0.12176447572670678,
+      -0.08131919982748674,
+      0.2801130988325825,
+      -0.09413983679074167,
+      -0.46763790208945694,
+      0.5267989573176437,
+      0.9707790278400686,
+      0.545775336386406,
+      0.10274654222287977,
+      -0.03540368258713427,
+      -0.09423900102110744,
+      -0.23353729840042012,
+      -1.8676023941990667,
+      -1.0456300476888107,
+      -0.05023549036945435,
+      -0.09973511722528312,
+      -0.1667651987783517,
+      -0.10223493895631622,
+      5.769587620927757,
+      -1.6987533594732331,
+      1.298980730690557,
+      0.3924422755645331,
+      -0.5608961877755706,
+      -0.13665686492235302,
+      0.24376605909489943,
+      -0.322722692782717,
+      -0.28402307073784305,
+      0.21450616741975842,
+      0.27616023773468434,
+      -0.22151426478238007,
+      -2.379449752990489,
+      0.26770957432112114,
+      1.6728140347205347,
+      1.0218389034084348,
+      -0.2589716350419949,
+      -0.6091489477632046
     ],
     [
-      -0.17325949904557789,
-      0.8469931420801717,
-      -0.17291345747016895,
-      0.7415838862619261,
-      0.4274229742431583,
-      -0.09169997501324818,
-      -0.03597382792706312,
-      -0.13192135575319,
-      -0.2232770261032077,
-      -0.5592833175250984,
-      0.5337511339882469,
-      -0.7015203611158959,
-      -0.8050378425269331,
-      -1.391476008727117,
-      -0.3735367392593157,
-      2.0229440028156285,
-      -0.4181439506999733,
-      -0.36284605476876275,
-      -0.4915128191910597,
-      -0.18772225278575058,
-      -0.1836211986385558,
-      -0.160170732625766,
-      -0.6051851028858776,
-      -1.0565838516982902,
-      0.5189958389469236,
-      -0.21433651619833852,
-      -0.023427702566669335,
-      -0.06225802709330549,
-      -0.2479768365131114,
-      0.6440642269943153,
-      0.2166100015163753,
-      0.5621214112752978,
-      -2.313937425413541,
-      -0.21383821821874424,
-      0.9835776683215183,
-      -0.2868222554936089,
-      -0.3627790090966197,
-      1.6715362856528764,
-      0.562618698865241,
-      0.5171144296225592,
-      -0.2875537588133474,
-      3.7650951394831975,
-      -0.8430120071606295,
-      -2.9135485020163494,
-      -0.7732932028803183,
-      0.5932157539375889,
-      -0.2654507724150584,
-      0.48514783195537947,
-      0.7791418129403005,
-      -0.04756567767655289,
-      -0.9235484068748897,
-      -0.09163744841391439,
-      -0.6668721180230781,
-      -0.06321633127931364,
-      -0.6917289046302094,
-      -0.1305307192739786,
-      -1.1611593110986207,
-      0.5263090658353216,
-      -1.4746064278386666,
-      0.9460179482446475,
-      2.4559982942328866,
-      0.47805946230351637,
-      1.1885114249751079,
-      -0.16691223659534524,
-      -0.09169997501324818,
-      -0.3949458468417482,
-      0.474115087649099,
-      1.25941806477877,
-      0.15775963405235455,
-      -1.8365325489417232,
-      1.928737362375423,
-      -0.3042033412226444,
-      -0.13268872031822843,
-      0.5825827594443002,
-      -0.7819548619354546,
-      -0.3715523694687792,
-      1.11683978664795,
-      0.6406233034386648,
-      0.8966843996933499,
-      -0.13192135575319,
-      0.0660616293488582,
-      1.3349408184184337,
-      -0.39160770131537814,
-      0.0035731969209047464,
-      1.2860627823141233,
-      -0.38361195906555495,
-      3.785997345890054,
-      -2.6370503870308153,
-      1.5173096973089502,
-      -1.7959354415295845,
-      -1.343767356940433,
-      -0.34777521277572043,
-      1.3770803738799031,
-      0.8465636489321146,
-      -0.18640547635945673,
-      -0.2589272346446866,
-      0.5263090658353216,
-      0.7753397260785132,
-      -0.08233430114481251,
-      -1.0755682097425807,
-      0.08747829557375957,
-      -0.40249375179638763,
-      6.545271985656959,
-      1.6846671518257648,
-      -0.3048123502498132,
-      -0.23150009268290092,
-      0.2660331927407965,
-      0.3908591521610277
+      -0.20096701089802216,
+      -0.010402276185075138,
+      -0.022321369638523325,
+      -0.024545494904024533,
+      -0.01793462283728077,
+      -0.034647751257421984,
+      -0.02716585924235742,
+      -0.02230246026922837,
+      -0.04885742074122034,
+      -0.04891816863056139,
+      2.052434936836443,
+      -0.192828809012733,
+      0.2388165649797849,
+      -0.37855932986681134,
+      -0.07602023085376276,
+      1.7239126496442558,
+      -0.1534625346537713,
+      -0.08160398855086283,
+      -1.3262684198300179,
+      0.855269781606844,
+      0.5587168101932891,
+      0.9617184950632411,
+      0.05785242056568412,
+      -0.053842545882565845,
+      -0.378775128530216,
+      -0.06496637299602952,
+      -0.19638794740755958,
+      -0.1099832209709207,
+      -0.07647306289921246,
+      -0.19649829539926536,
+      -0.25522275648804493,
+      0.04892671214484848,
+      -0.11927652982857483,
+      -0.0963491116495785,
+      -0.21616701004691377,
+      -0.25047768650742197,
+      -0.0816172308111584,
+      -0.05690470044185009,
+      -0.021322096725811285,
+      -0.15086520303532597,
+      -0.14437176873919905,
+      -0.04891816863056139,
+      -0.038576160944035355,
+      -0.213276804121817,
+      -0.2173531194017129,
+      0.3995783519680916,
+      -0.18384054282875054,
+      -0.5211272315571109,
+      -0.12643165117685026,
+      -0.25276895916101216,
+      -0.11329436931706419,
+      1.1612059589349704,
+      -0.11248931513955453,
+      -0.12374447350179289,
+      -1.28808644398951,
+      -1.2063351249736767,
+      3.4372177682007528,
+      2.377561573436741,
+      5.308276699846725,
+      5.322472331118896,
+      -1.6145670810630826,
+      -0.734520148745396,
+      -1.8620527189813199,
+      -0.2419635007794443,
+      -0.6036069731883306,
+      -0.12788225005780757,
+      -0.09158087419671658,
+      -0.15389301357310475,
+      -0.1242286628939575,
+      0.5632225348235791,
+      -0.09989384731089046,
+      -0.16883066263173055,
+      -0.4014794057628589,
+      -0.13983728654493294,
+      -0.026907661574959302,
+      -0.047200080115247206,
+      -0.6575903430518879,
+      -0.04523925619883614,
+      1.2404612642076691,
+      -0.340990745290617,
+      -0.6895042071854439,
+      -1.3679435680584948,
+      -0.2434765243311399,
+      -0.1090076266484587,
+      -1.1000615595167431,
+      -0.2900485366030587,
+      -0.0449359688233357,
+      -0.03504317195599471,
+      -0.26606133645500796,
+      -0.2033090472929104,
+      -0.6236533149063691,
+      -0.022321369638523325,
+      -0.20713425739002525,
+      -0.045593529292967,
+      -0.3158490442968042,
+      2.185147705873577,
+      -0.22774667624059655,
+      -0.659075235368868,
+      -0.20939372718311794,
+      -0.15434292077249753,
+      -0.12052465560727785,
+      -1.6700021317344849,
+      -0.23053330570584088,
+      0.8005264906330699,
+      -0.7009452052306487,
+      -0.06931253997455225,
+      0.9717298117797575,
+      -0.012277236022416212,
+      0.30922888126483306,
+      1.9767412923952368,
+      -0.17017881580026648,
+      -0.5147290220527347,
+      1.3234502788644755,
+      -0.178686638860448,
+      -0.216769552913076,
+      0.3279899514035844,
+      -0.24286764329441207,
+      1.003668743374414,
+      0.2669451668805092,
+      -0.02716585924235742,
+      -0.03442133068040464,
+      -0.2642405829172888,
+      -0.19479321881463832,
+      -0.14187943867588684,
+      -0.1322374533034853,
+      -0.17692826625477232,
+      0.25895718103525894,
+      -0.047130482276258115,
+      2.3785069396389646,
+      -0.9625071144670043,
+      -0.5128606637243036,
+      1.1373094309102758,
+      -0.04073732098194438,
+      -0.021621226918715285,
+      0.6474737813108495,
+      -0.503392282186574,
+      -1.3248062474632822,
+      -0.07229255991769376,
+      -0.13775539269900236,
+      -0.54247117303219,
+      -0.9770266825378056,
+      -0.0885524944177019,
+      0.8467308844265351,
+      -0.4709257888733342,
+      -0.13560388384449162,
+      -0.2443899246003283,
+      -0.06795803053949101,
+      -0.9171252308463241,
+      -0.27261336980770046,
+      -0.05922674885464575,
+      -0.03366686331022842,
+      -0.13627147253202204,
+      -0.2946699625910933
     ],
     [
-      -0.08287008635301533,
-      -0.1707186300864661,
-      -0.12411651496367082,
-      -0.13270980721857845,
-      -0.2308574863622476,
-      -0.340776333289237,
-      -0.2799539501495442,
-      -0.09353490554395046,
-      -0.11003196602952028,
-      0.8370329970945711,
-      -0.9057550121088088,
-      -0.44699057472930825,
-      -0.5638365474312759,
-      1.5143809843780474,
-      -0.7058026613700651,
-      -1.5992446723775544,
-      -0.39548545877201235,
-      -0.5818138768809792,
-      -1.1918930105665881,
-      -0.20119295958315825,
-      -0.4106024666342698,
-      -0.6084017910626903,
-      -0.4053078456262127,
-      -1.2701652804160122,
-      -0.9082937192503221,
-      -0.41358650963042953,
-      -0.14507759075384705,
-      -0.25541322585710685,
-      -0.2834804666647943,
-      -0.35866596133820716,
-      -0.4883764320145827,
-      -0.7006698082266908,
-      -2.394669342089395,
-      -0.18631140125245332,
-      -0.8431834537195231,
-      -0.11298527662620045,
-      -0.46579176626926616,
-      -4.0614990005298495,
-      -3.2045951451142787,
-      -1.5108427566999016,
-      0.004582928152167648,
-      -3.9044112386784877,
-      -0.6588826838562699,
-      -2.3102211611673735,
-      -0.6601615139051208,
-      -0.5798142278897691,
-      -0.16935515654474664,
-      -0.2994100797642838,
-      -0.13545535197391778,
-      -0.28214898970349794,
-      0.07498510488180002,
-      -0.09906076894705139,
-      0.3030837833573295,
-      0.1750985085211981,
-      -0.549252376368689,
-      0.19508025476427163,
-      -0.680325815274731,
-      -0.441542891929835,
-      -1.1986281021735854,
-      -1.2750417431062337,
-      -1.3332940190069578,
-      -0.6893972025209948,
-      -0.1977405184178932,
-      -0.08290274818842105,
-      -0.340776333289237,
-      -0.7441344382438827,
-      -0.11203102845288844,
-      -0.7110498382506533,
-      -0.4371808188047473,
-      2.1062550992856974,
-      -1.2673967495828176,
-      -0.4547516653443288,
-      -0.07847727400663201,
-      -1.2025943363863212,
-      -0.18833967483902414,
-      -0.22494114094975098,
-      -0.496679271117596,
-      -0.9206374373470854,
-      -0.8795489026728613,
-      -0.09353490554395046,
-      0.2645294880545335,
-      -0.8676466201790525,
-      -0.5294129510334283,
-      -0.7650069149680953,
-      -0.20093881100566283,
-      -0.25427142474416814,
-      -0.5720789301099184,
-      -1.5271844756130357,
-      -0.5885493969076697,
-      -2.011108297941673,
-      1.2077089211008882,
-      -0.2762513025220224,
-      -0.7261332226437589,
-      -0.5449319964956103,
-      0.3749915728825021,
-      -0.2782562410203223,
-      -0.441542891929835,
-      -0.7834555744093303,
-      -0.14867935969258925,
-      0.7397541876426704,
-      -0.9776516885496953,
-      -0.22530286398490842,
-      -1.9790005442385892,
-      -0.9860056472866394,
-      -0.7413541914609503,
-      -0.18411241931805505,
-      -0.6485578833987582,
-      -0.25343404875508874
+      1.8897904557588376,
+      -0.4065449746416101,
+      -0.17770571441828095,
+      -0.08674991934828644,
+      -0.17776788594157178,
+      -0.14117075774985638,
+      -0.09877920913134704,
+      -0.25962862247045354,
+      -0.061215189726966386,
+      -0.0801993566881258,
+      -0.21134693753553904,
+      0.3996465832647301,
+      -0.03256914350788287,
+      -0.4821799957385677,
+      -0.4924819665918905,
+      -0.24588363184450346,
+      1.2606356415490196,
+      -0.5443215754088512,
+      -1.3483150909527428,
+      -0.08518697238524822,
+      -0.35257018335295365,
+      -0.15897284597849523,
+      -0.016733936115676168,
+      -0.20299481821910023,
+      0.7763380444698619,
+      -0.2671027938254607,
+      0.49864505984630086,
+      -0.22025278447054614,
+      -0.09198210500568613,
+      1.5370106115116917,
+      1.3550083446367125,
+      0.28313402149560757,
+      0.3879806963372193,
+      -0.45744283618769105,
+      -1.0789325791069586,
+      0.4383878929637929,
+      -0.21694394141030596,
+      -0.2599869744004242,
+      -0.06976641396133308,
+      -0.16614621978753902,
+      -0.2373805141056377,
+      -0.0801993566881258,
+      -0.31064314752703276,
+      0.32324377287639905,
+      0.8058367916495234,
+      -0.3200377502355957,
+      0.3181233533685438,
+      -2.5032116025247126,
+      0.2316020066074326,
+      0.5003907920072163,
+      0.9913842171539727,
+      -0.11016841061537778,
+      0.6035748084337778,
+      0.7417117783125193,
+      1.8773509042578855,
+      0.9799382625267877,
+      -0.8470044116828592,
+      -0.31063141992363535,
+      -1.1772431210343781,
+      -0.8590814386854976,
+      0.4951737646524929,
+      -0.029368750464679808,
+      4.7610658324259765,
+      -0.743635697439492,
+      -3.1362811548935805,
+      -0.5356587619290217,
+      0.8230701573803431,
+      0.8440918459891406,
+      0.11924185150763664,
+      -0.11293394043703037,
+      0.5919726631224852,
+      0.8032139023290298,
+      -0.9349952775927156,
+      -0.027655966030320705,
+      -0.1460961406450071,
+      -0.04974224495355965,
+      -0.8769319561304529,
+      -0.1843209243758882,
+      -0.1222017019111657,
+      -0.9053200774044482,
+      -0.5806913000732286,
+      -1.4488210899087115,
+      -0.1919834468794482,
+      -0.5282676433694375,
+      -0.34265043421492514,
+      -0.94267507673325,
+      -0.17160835923219953,
+      -1.3854666707072045,
+      1.7062359207688604,
+      -0.08256179148785633,
+      0.8779192494271738,
+      -0.17770571441828095,
+      -0.4600023441878432,
+      -0.16277246089804837,
+      1.7005937490858762,
+      -0.29512107733566245,
+      0.7049665635357611,
+      -0.2043318696078652,
+      0.9906429791800908,
+      0.4960251498826753,
+      -0.05433782036761985,
+      -1.6784382541505787,
+      -0.519014371242897,
+      -0.09673483956823928,
+      3.832604627737059,
+      -0.2392863498385694,
+      -0.11852909342529717,
+      -0.33422288545098616,
+      -0.03974339037553095,
+      -0.1970645055847843,
+      0.4258995274582617,
+      -0.8246938712561781,
+      -0.15786337932611919,
+      1.1622015073570817,
+      0.8426437405300172,
+      -0.5907009832776942,
+      0.7452901297043021,
+      -0.13584575837892413,
+      -0.08970895404443571,
+      -0.09877920913134704,
+      -0.16370490892887896,
+      -0.2631021838349082,
+      0.7572828224092834,
+      0.20382877572400007,
+      0.5355221567687931,
+      0.7722242931942318,
+      -0.02754321167343637,
+      -0.32528727910270366,
+      -0.23953103944891294,
+      4.836436193668985,
+      -2.679257701509994,
+      -0.04410367902499128,
+      -0.025280626563120766,
+      -0.661073819244049,
+      -0.07515615341959336,
+      -1.681320441498998,
+      -0.6974742475979627,
+      -0.23142359834764295,
+      0.5094092320219726,
+      -0.7158193718369188,
+      -0.31042003573747645,
+      -0.1452049290244862,
+      -0.3609300914857337,
+      0.9660703144352587,
+      0.4774912021819432,
+      0.42582155179612985,
+      -0.4361181090286458,
+      6.863100627043108,
+      -0.4393064417886874,
+      -0.5412077250532231,
+      -0.1273887691401061,
+      -0.27544218893968114,
+      0.5880785413591106
+    ],
+    [
+      -1.2947985809164233,
+      -0.04299599150708535,
+      -0.08366742539302857,
+      -0.0988591261793839,
+      -0.12722332512211643,
+      -0.12973829027374864,
+      -0.09903207288233715,
+      -0.05890330454534362,
+      -0.19013109398394912,
+      -0.2422138579999494,
+      -0.7831132679271434,
+      -0.5044109723571394,
+      -0.16915617599392305,
+      0.02768475087942398,
+      -0.5698217371074815,
+      -1.1819663778728082,
+      -1.0039051625087037,
+      -0.549639149993644,
+      1.5812063596243633,
+      -0.4184755395146234,
+      -0.5205108255640482,
+      -0.4741134937648106,
+      -0.05782850157981761,
+      -0.28923584439220046,
+      -1.303779401117922,
+      -0.4441135442825731,
+      -0.722700642545552,
+      -0.8981419547378331,
+      -0.19157229262304812,
+      -1.1923482840925448,
+      -1.0985621758172168,
+      -0.9960213669506082,
+      -0.8815246663607333,
+      -0.5288501564108509,
+      -0.9409215434573887,
+      -0.8546541164172659,
+      -0.20923054541485522,
+      -0.348647148309214,
+      -0.08629175806483264,
+      -0.7830294894994492,
+      0.09157468445596365,
+      -0.2422138579999494,
+      -0.25742791161302786,
+      -0.4157905343657765,
+      -0.7529034731108073,
+      -0.05368312727422505,
+      -0.5725498489845913,
+      -2.1196863206837655,
+      -0.4716672355246927,
+      -0.7782019497713445,
+      -0.6298759718399533,
+      -0.6129071879103054,
+      -0.5976886187500537,
+      -0.5764757724032191,
+      -3.5486657290339494,
+      -4.059292450642417,
+      -1.7054875011657327,
+      -1.0329020721336648,
+      -3.288174091853335,
+      -2.907703762724812,
+      -0.9320920666534067,
+      -0.3749927705170421,
+      -4.8712469876793145,
+      -0.8153056962441854,
+      -2.057392734728759,
+      -0.6816176900169102,
+      -0.4901135987819967,
+      -0.6462797738333478,
+      -0.5845644001389246,
+      -0.4062606416200617,
+      -0.39817473317111984,
+      -0.8545182402459595,
+      0.7346583833129688,
+      -0.11434011787972471,
+      -0.16770860818084324,
+      -0.20819930493501335,
+      0.16955714305163153,
+      -0.23363664677164597,
+      -0.6303103700417433,
+      0.16498115351744588,
+      0.007923919955495427,
+      1.6759862441941056,
+      0.08726677150813066,
+      -0.4741410554530922,
+      0.22905900157294587,
+      -0.6169153450554486,
+      -0.2256600142997704,
+      -1.439929971054997,
+      -1.2954767032620347,
+      -0.7644915453252341,
+      -0.22722769235750392,
+      -0.08366742539302857,
+      -0.0443355561528679,
+      -0.22749299453660485,
+      -1.2356065333560615,
+      -0.9640251262036206,
+      -0.9266887455877028,
+      0.15460281639750123,
+      -1.071248193995878,
+      -0.7567148136084031,
+      -0.5666159401128501,
+      1.975112170208896,
+      0.17691588140821338,
+      -0.529567775314017,
+      -2.8838965004642976,
+      -0.5260188150211248,
+      -0.31612887762179415,
+      -0.04009800446676458,
+      -0.1717473609482381,
+      -0.981957627522441,
+      -1.3784517827126295,
+      -0.04798484041669854,
+      -0.7079322498251522,
+      -0.8054245190976101,
+      -0.758955055505161,
+      0.2184022703599226,
+      -0.679343007022793,
+      -0.50276351753389,
+      -0.2748692035595504,
+      -0.09903207288233715,
+      -0.24284236844998006,
+      0.13232121159068583,
+      -1.070248454535747,
+      -0.6860481464288285,
+      -0.6211913365995521,
+      -0.6021318387295456,
+      -0.2385393159807013,
+      -0.2104809105724473,
+      -1.2383512135137111,
+      -2.725278656844286,
+      -1.420638321347412,
+      -0.42053600295596294,
+      -0.2781814764185201,
+      -0.04986974684322504,
+      -0.3795549717986861,
+      -1.8950699193014036,
+      0.546954782907185,
+      -0.5560141422855943,
+      -0.8494264129762741,
+      0.20998243266766034,
+      0.4865328374665142,
+      -0.26734688922447736,
+      -0.49188739811055576,
+      -0.6484951354316307,
+      -0.7459693490349973,
+      -0.7785333056663716,
+      -0.1839331880643152,
+      -3.0960770379028104,
+      -0.10912113423305829,
+      -0.27824831346874324,
+      -0.25912676269059803,
+      -0.5657686961830939,
+      -0.6031538217879338
     ]
   ],
   "config": {
@@ -474,14 +809,16 @@
   "intent_list": [
     "HVACFanSpeed",
     "HVACTemperature",
+    "MediaControl",
     "VolumeControl",
     null
   ],
   "intercept": [
-    -2.0426926790934385,
-    -2.0967218978636635,
-    -2.263067120777316,
-    1.0460915926972372
+    -2.6443395431175105,
+    -2.698147514538897,
+    -2.578196188004744,
+    -2.690807478655429,
+    1.2383347776779259
   ],
-  "t_": 7281.0
+  "t_": 10385.0
 }
\ No newline at end of file
diff --git a/model/probabilistic_intent_parser/intent_parser.json b/model/probabilistic_intent_parser/intent_parser.json
index b86c94a..c1a94da 100644
--- a/model/probabilistic_intent_parser/intent_parser.json
+++ b/model/probabilistic_intent_parser/intent_parser.json
@@ -194,8 +194,12 @@
       "slot_filler_name": "slot_filler_1"
     },
     {
-      "intent": "VolumeControl",
+      "intent": "MediaControl",
       "slot_filler_name": "slot_filler_2"
+    },
+    {
+      "intent": "VolumeControl",
+      "slot_filler_name": "slot_filler_3"
     }
   ]
 }
\ No newline at end of file
diff --git a/model/probabilistic_intent_parser/slot_filler_0/model.crfsuite b/model/probabilistic_intent_parser/slot_filler_0/model.crfsuite
index ffc3f12..1cfc976 100644
--- a/model/probabilistic_intent_parser/slot_filler_0/model.crfsuite
+++ b/model/probabilistic_intent_parser/slot_filler_0/model.crfsuite
diff --git a/model/probabilistic_intent_parser/slot_filler_0/slot_filler.json b/model/probabilistic_intent_parser/slot_filler_0/slot_filler.json
index 9972c21..6ad4279 100644
--- a/model/probabilistic_intent_parser/slot_filler_0/slot_filler.json
+++ b/model/probabilistic_intent_parser/slot_filler_0/slot_filler.json
@@ -101,9 +101,9 @@
       {
         "args": {
           "entities": [
-            "to_or_by",
+            "hvac_fan_speed_action",
             "numeric_value",
-            "hvac_fan_speed_action"
+            "to_or_by"
           ],
           "entity_filter": {
             "automatically_extensible": false
diff --git a/model/probabilistic_intent_parser/slot_filler_1/model.crfsuite b/model/probabilistic_intent_parser/slot_filler_1/model.crfsuite
index d0a2123..6f8d758 100644
--- a/model/probabilistic_intent_parser/slot_filler_1/model.crfsuite
+++ b/model/probabilistic_intent_parser/slot_filler_1/model.crfsuite
diff --git a/model/probabilistic_intent_parser/slot_filler_1/slot_filler.json b/model/probabilistic_intent_parser/slot_filler_1/slot_filler.json
index bbc51a4..014367a 100644
--- a/model/probabilistic_intent_parser/slot_filler_1/slot_filler.json
+++ b/model/probabilistic_intent_parser/slot_filler_1/slot_filler.json
@@ -101,9 +101,9 @@
       {
         "args": {
           "entities": [
-            "hvac_temperature_action",
             "to_or_by",
-            "numeric_value"
+            "numeric_value",
+            "hvac_temperature_action"
           ],
           "entity_filter": {
             "automatically_extensible": false
diff --git a/model/probabilistic_intent_parser/slot_filler_2/model.crfsuite b/model/probabilistic_intent_parser/slot_filler_2/model.crfsuite
index 65a8577..42e5187 100644
--- a/model/probabilistic_intent_parser/slot_filler_2/model.crfsuite
+++ b/model/probabilistic_intent_parser/slot_filler_2/model.crfsuite
diff --git a/model/probabilistic_intent_parser/slot_filler_2/slot_filler.json b/model/probabilistic_intent_parser/slot_filler_2/slot_filler.json
index 3ea6fbb..da59a3e 100644
--- a/model/probabilistic_intent_parser/slot_filler_2/slot_filler.json
+++ b/model/probabilistic_intent_parser/slot_filler_2/slot_filler.json
@@ -101,9 +101,7 @@
       {
         "args": {
           "entities": [
-            "to_or_by",
-            "numeric_value",
-            "volume_control_action"
+            "media_control_action"
           ],
           "entity_filter": {
             "automatically_extensible": false
@@ -120,7 +118,11 @@
       },
       {
         "args": {
-          "entities": [],
+          "entities": [
+            "media_artist",
+            "media_album",
+            "media_item"
+          ],
           "entity_filter": {
             "automatically_extensible": true
           },
@@ -178,11 +180,12 @@
     "unit_name": "crf_slot_filler"
   },
   "crf_model_file": "model.crfsuite",
-  "intent": "VolumeControl",
+  "intent": "MediaControl",
   "language_code": "en",
   "slot_name_mapping": {
-    "numeric_value": "numeric_value",
-    "to_or_by": "to_or_by",
-    "volume_control_action": "volume_control_action"
+    "media_album": "media_album",
+    "media_artist": "media_artist",
+    "media_control_action": "media_control_action",
+    "media_item": "media_item"
   }
 }
\ No newline at end of file
diff --git a/model/probabilistic_intent_parser/slot_filler_3/metadata.json b/model/probabilistic_intent_parser/slot_filler_3/metadata.json
new file mode 100644
index 0000000..18ccb30
--- /dev/null
+++ b/model/probabilistic_intent_parser/slot_filler_3/metadata.json
@@ -0,0 +1,3 @@
+{
+  "unit_name": "crf_slot_filler"
+}
\ No newline at end of file
diff --git a/model/probabilistic_intent_parser/slot_filler_3/model.crfsuite b/model/probabilistic_intent_parser/slot_filler_3/model.crfsuite
new file mode 100644
index 0000000..130b750
--- /dev/null
+++ b/model/probabilistic_intent_parser/slot_filler_3/model.crfsuite
diff --git a/model/probabilistic_intent_parser/slot_filler_3/slot_filler.json b/model/probabilistic_intent_parser/slot_filler_3/slot_filler.json
new file mode 100644
index 0000000..837ae19
--- /dev/null
+++ b/model/probabilistic_intent_parser/slot_filler_3/slot_filler.json
@@ -0,0 +1,188 @@
+{
+  "config": {
+    "crf_args": {
+      "algorithm": "lbfgs",
+      "c1": 0.1,
+      "c2": 0.1
+    },
+    "data_augmentation_config": {
+      "add_builtin_entities_examples": true,
+      "capitalization_ratio": 0.2,
+      "min_utterances": 200
+    },
+    "feature_factory_configs": [
+      {
+        "args": {
+          "common_words_gazetteer_name": "top_10000_words_stemmed",
+          "language_code": "en",
+          "n": 1,
+          "use_stemming": true
+        },
+        "factory_name": "ngram",
+        "offsets": [
+          -2,
+          -1,
+          0,
+          1,
+          2
+        ]
+      },
+      {
+        "args": {
+          "common_words_gazetteer_name": "top_10000_words_stemmed",
+          "language_code": "en",
+          "n": 2,
+          "use_stemming": true
+        },
+        "factory_name": "ngram",
+        "offsets": [
+          -2,
+          1
+        ]
+      },
+      {
+        "args": {},
+        "factory_name": "is_digit",
+        "offsets": [
+          -1,
+          0,
+          1
+        ]
+      },
+      {
+        "args": {},
+        "factory_name": "is_first",
+        "offsets": [
+          -2,
+          -1,
+          0
+        ]
+      },
+      {
+        "args": {},
+        "factory_name": "is_last",
+        "offsets": [
+          0,
+          1,
+          2
+        ]
+      },
+      {
+        "args": {
+          "language_code": "en",
+          "n": 1
+        },
+        "factory_name": "shape_ngram",
+        "offsets": [
+          0
+        ]
+      },
+      {
+        "args": {
+          "language_code": "en",
+          "n": 2
+        },
+        "factory_name": "shape_ngram",
+        "offsets": [
+          -1,
+          0
+        ]
+      },
+      {
+        "args": {
+          "language_code": "en",
+          "n": 3
+        },
+        "factory_name": "shape_ngram",
+        "offsets": [
+          -1
+        ]
+      },
+      {
+        "args": {
+          "entities": [
+            "numeric_value",
+            "to_or_by",
+            "volume_control_action"
+          ],
+          "entity_filter": {
+            "automatically_extensible": false
+          },
+          "tagging_scheme_code": 2,
+          "use_stemming": true
+        },
+        "factory_name": "entity_match",
+        "offsets": [
+          -2,
+          -1,
+          0
+        ]
+      },
+      {
+        "args": {
+          "entities": [],
+          "entity_filter": {
+            "automatically_extensible": true
+          },
+          "tagging_scheme_code": 2,
+          "use_stemming": true
+        },
+        "drop_out": 0.5,
+        "factory_name": "entity_match",
+        "offsets": [
+          -2,
+          -1,
+          0
+        ]
+      },
+      {
+        "args": {
+          "entity_labels": [
+            "snips/amountOfMoney",
+            "snips/date",
+            "snips/datePeriod",
+            "snips/datetime",
+            "snips/duration",
+            "snips/number",
+            "snips/ordinal",
+            "snips/percentage",
+            "snips/temperature",
+            "snips/time",
+            "snips/timePeriod"
+          ],
+          "language_code": "en",
+          "tagging_scheme_code": 1
+        },
+        "factory_name": "builtin_entity_match",
+        "offsets": [
+          -2,
+          -1,
+          0
+        ]
+      },
+      {
+        "args": {
+          "cluster_name": "brown_clusters",
+          "use_stemming": false
+        },
+        "factory_name": "word_cluster",
+        "offsets": [
+          -2,
+          -1,
+          0,
+          1
+        ]
+      }
+    ],
+    "tagging_scheme": 1,
+    "unit_name": "crf_slot_filler"
+  },
+  "crf_model_file": "model.crfsuite",
+  "intent": "VolumeControl",
+  "language_code": "en",
+  "slot_name_mapping": {
+    "numeric_value": "numeric_value",
+    "to_or_by": "to_or_by",
+    "volume_control_action": "volume_control_action"
+  }
+}
\ No newline at end of file