diff --git a/.travis.yml b/.travis.yml
index 72fa0ff..619b8b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,18 +10,20 @@ python:
 sudo: required
 
 install:
-  - sudo apt-get update
-  - sudo apt-get install -y portaudio19-dev python-all-dev --no-install-recommends
-  - sudo apt-get install -y lilv-utils calf-plugins guitarix --no-install-recommends
-  - sudo apt-get install -y libavahi-compat-libdnssd1 --no-install-recommends
-  - pip3 install coveralls
-  - pip3 install git+https://github.com/depl0y/pybonjour-python3
-  - pip3 install zeroconf
-  - python3 setup.py develop
+  - make install-develop-requirements
+  - make install-tests-requirements
+  - python setup.py develop
 
 script:
   - lv2ls
-  - coverage3 run --source=webservice wstest/config.py test
+  - make test
 
 after_success:
-  - 'bash <(curl -s https://codecov.io/bash)'
+  - bash <(curl -s https://codecov.io/bash)
+
+jobs:
+  include:
+    - stage: doc
+      script:
+        - make install-docs-requirements
+        - make docs
diff --git a/CHANGES b/CHANGES
index 0138190..aae30b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,27 @@
+Version 0.4.0 - released mm/dd/18
+=================================
+
+ - Issue #45 - Add Makefile
+ - Issue #44 - Update libraries
+
+   - PluginsManager v0.4.0? -> v0.7.0
+   - Application v0.2.0 -> v0.4.0
+
 Version 0.3.0 - released 05/31/17
 =================================
- - Issues #31 - Using logging instead print
- - Issues #26 - Implemented secure close ([Application issue 29](https://github.com/PedalPi/Application/issues/29) version 0.3.0)
- - Issues #27 - Rename zeroconf device name
+
+ - Issue #31 - Using logging instead print
+ - Issue #26 - Implemented secure close ([Application issue 29](https://github.com/PedalPi/Application/issues/29) version 0.3.0)
+ - Issue #27 - Rename zeroconf device name
  - Improve Component Data documentation
  - Fix '#' problem when request plugin data
  - Issue #40 - Add support for plugins manager v0.5.0 and Application v0.3.0
+
    - Now using PluginsManager notification implementation (``with observer:``)
+
  - Issue #37 - Banks swap -> Bank move
 
 Version 0.2.0 - released 05/13/17
 =================================
+
  - Initial release
diff --git a/README.rst b/README.rst
index 776b06a..671c9fc 100644
--- a/README.rst
+++ b/README.rst
@@ -79,7 +79,7 @@ The registration must occur before application initialization (``application.sta
     application = Application(path_data="data/", address='localhost')
 
     from webservice.webservice import WebService
-    application.register(WebService(application, port))
+    application.register(WebService(application, port=3000))
 
 2. Initialization of the web server
 +++++++++++++++++++++++++++++++++++
@@ -122,7 +122,7 @@ look like the following code:
     application = Application(path_data="data/", address='localhost')
 
     from webservice.webservice import WebService
-    application.register(WebService(application, port))
+    application.register(WebService(application, port=3000))
 
     application.start()
 
@@ -163,17 +163,20 @@ Maintenance
 Documentation
 *************
 
+Is necessary to install `nodejs`_.
+
+.. _nodejs: https://nodejs.org/en/
+
 .. code-block:: bash
 
     # Installing dependencies
-    npm install -g aglio
+    make install-docs-requirements
 
     # Generate doc
-    cd docs/
-    aglio -i documentation.apib --theme-variables streak --theme-template triple -o index.html
+    make docs
 
     # View documentation
-    firefox index.html
+    make docs-see
 
 Test
 ****
@@ -185,5 +188,5 @@ Test
 
     coverage3 run --source=webservice wstest/config.py test
     coverage3 report
-    coverage3 html
-    firefox htmlcov/index.html
+    make test-details
+
diff --git a/docs/index.html b/docs/index.html
index f0a0ea1..cae1334 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -524,6 +524,7 @@
     {
       "<span class="hljs-attribute">connections</span>": <span class="hljs-value">[
         {
+          "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
           "<span class="hljs-attribute">input</span>": <span class="hljs-value">{
             "<span class="hljs-attribute">index</span>": <span class="hljs-value"><span class="hljs-number">0</span></span>,
             "<span class="hljs-attribute">effect</span>": <span class="hljs-value"><span class="hljs-number">0</span></span>,
@@ -535,6 +536,7 @@
           </span>}
         </span>},
         {
+          "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
           "<span class="hljs-attribute">input</span>": <span class="hljs-value">{
             "<span class="hljs-attribute">index</span>": <span class="hljs-value"><span class="hljs-number">0</span></span>,
             "<span class="hljs-attribute">symbol</span>": <span class="hljs-value"><span class="hljs-string">"playback_1"</span>
@@ -854,6 +856,7 @@
 </dd><dt>param_index</dt><dd><code>number</code>&nbsp;<span class="required">(required)</span>&nbsp;<span class="text-muted example"><strong>Example:&nbsp;</strong><span>0</span></span><p>Param position in effect params list</p>
 </dd></dl></div></div></div><hr class="split"><div class="middle"><section id="effect-connections-management" class="resource-group"><h2 class="group-heading">Effect connections management <a href="#effect-connections-management" class="permalink">&para;</a></h2><p>Connect and disconnect effects.</p>
 </section></div><div class="middle"><div id="effect-connections-management-manages-by-key" class="resource"><h3 class="resource-heading">Manages by key <a href="#effect-connections-management-manages-by-key" class="permalink">&para;</a></h3></div></div><div class="right"><div class="definition"><span class="method post">POST</span>&nbsp;<span class="uri"><span class="hostname">http://pedalpi.local:3000/v1</span>/bank/<span class="hljs-attribute" title="bank_index">1</span>/pedalboard/<span class="hljs-attribute" title="pedalboard_index">3</span>/connect</span></div><div class="tabs"><div class="example-names"><span>Requests</span><span class="tab-button">example 1</span><span class="tab-button">example 2</span></div><div class="tab"><div><div class="inner"><h5>Headers</h5><pre><code><span class="hljs-attribute">Content-Type</span>: <span class="hljs-string">application/json; charset=UTF-8</span></code></pre><div style="height: 1px;"></div><h5>Body</h5><pre><code>{
+  "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
   "<span class="hljs-attribute">output</span>": <span class="hljs-value">{
     "<span class="hljs-attribute">effect</span>": <span class="hljs-value"><span class="hljs-number">0</span></span>,
     "<span class="hljs-attribute">symbol</span>": <span class="hljs-value"><span class="hljs-string">"out"</span></span>,
@@ -864,6 +867,7 @@
     "<span class="hljs-attribute">index</span>": <span class="hljs-value"><span class="hljs-number">1</span>
   </span>}
 </span>}</code></pre><div style="height: 1px;"></div></div></div><div class="tabs"><div class="example-names"><span>Responses</span><span class="tab-button">200</span></div><div class="tab"><div><div class="inner"><div class="description text-muted">This response has no content.</div><div style="height: 1px;"></div></div></div></div></div></div><div class="tab"><div><div class="inner"><h5>Headers</h5><pre><code><span class="hljs-attribute">Content-Type</span>: <span class="hljs-string">application/json; charset=UTF-8</span></code></pre><div style="height: 1px;"></div><h5>Body</h5><pre><code>{
+  "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
   "<span class="hljs-attribute">output</span>": <span class="hljs-value">{
     "<span class="hljs-attribute">effect</span>": <span class="hljs-value"><span class="hljs-number">0</span></span>,
     "<span class="hljs-attribute">symbol</span>": <span class="hljs-value"><span class="hljs-string">"out"</span></span>,
@@ -1081,6 +1085,7 @@ <h4 id="header-notification-">Notification <code>on_current_pedalboard_changed</
       "<span class="hljs-attribute">name</span>":<span class="hljs-value"><span class="hljs-string">"hehueuhes ea"</span></span>,
       "<span class="hljs-attribute">connections</span>":<span class="hljs-value">[
          {
+            "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
             "<span class="hljs-attribute">input</span>":<span class="hljs-value">{
                "<span class="hljs-attribute">effect</span>":<span class="hljs-value"><span class="hljs-number">0</span></span>,
                "<span class="hljs-attribute">symbol</span>":<span class="hljs-value"><span class="hljs-string">"in_l"</span></span>,
@@ -1092,6 +1097,7 @@ <h4 id="header-notification-">Notification <code>on_current_pedalboard_changed</
             </span>}
          </span>},
          {
+            "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
             "<span class="hljs-attribute">input</span>":<span class="hljs-value">{
                "<span class="hljs-attribute">symbol</span>":<span class="hljs-value"><span class="hljs-string">"playback_1"</span></span>,
                "<span class="hljs-attribute">index</span>":<span class="hljs-value"><span class="hljs-number">0</span>
@@ -1124,8 +1130,9 @@ <h4 id="header-notification--1">Notification <code>on_bank_updated</code> <a cla
   "<span class="hljs-attribute">type</span>":<span class="hljs-value"><span class="hljs-string">"BANK"</span></span>,
   "<span class="hljs-attribute">updateType</span>":<span class="hljs-value"><span class="hljs-string">"DELETED"</span></span>,
   "<span class="hljs-attribute">bank</span>":<span class="hljs-value"><span class="hljs-number">3</span></span>,
-   "<span class="hljs-attribute">value</span>":<span class="hljs-value">{
+  "<span class="hljs-attribute">value</span>": <span class="hljs-value">{
       "<span class="hljs-attribute">name</span>":<span class="hljs-value"><span class="hljs-string">"My bank"</span></span>,
+      "<span class="hljs-attribute">index</span>":<span class="hljs-value"><span class="hljs-number">3</span></span>,
       "<span class="hljs-attribute">pedalboards</span>":<span class="hljs-value">[
          {
             "<span class="hljs-attribute">data</span>":<span class="hljs-value">{
@@ -1137,6 +1144,7 @@ <h4 id="header-notification--1">Notification <code>on_bank_updated</code> <a cla
             "<span class="hljs-attribute">name</span>":<span class="hljs-value"><span class="hljs-string">"Empty pedalboard"</span></span>,
             "<span class="hljs-attribute">connections</span>":<span class="hljs-value">[
                {
+                  "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
                   "<span class="hljs-attribute">input</span>":<span class="hljs-value">{
                      "<span class="hljs-attribute">symbol</span>":<span class="hljs-value"><span class="hljs-string">"playback_1"</span></span>,
                      "<span class="hljs-attribute">index</span>":<span class="hljs-value"><span class="hljs-number">0</span>
@@ -1148,8 +1156,7 @@ <h4 id="header-notification--1">Notification <code>on_bank_updated</code> <a cla
                </span>}
             ]
          </span>}
-      ]</span>,
-      "<span class="hljs-attribute">index</span>":<span class="hljs-value"><span class="hljs-number">3</span>
+      ]
    </span>}
 </span>}</code></pre>
 </li>
@@ -1187,6 +1194,7 @@ <h4 id="header-notification--2">Notification <code>on_pedalboard_updated</code>
       "<span class="hljs-attribute">name</span>":<span class="hljs-value"><span class="hljs-string">"Guitar hero"</span></span>,
       "<span class="hljs-attribute">connections</span>":<span class="hljs-value">[
          {
+            "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
             "<span class="hljs-attribute">input</span>":<span class="hljs-value">{
                "<span class="hljs-attribute">symbol</span>":<span class="hljs-value"><span class="hljs-string">"playback_1"</span></span>,
                "<span class="hljs-attribute">index</span>":<span class="hljs-value"><span class="hljs-number">0</span>
@@ -1594,6 +1602,7 @@ <h4 id="header-notification--6">Notification <code>on_connection_updated</code>
    "<span class="hljs-attribute">bank</span>":<span class="hljs-value"><span class="hljs-number">2</span></span>,
    "<span class="hljs-attribute">pedalboard</span>":<span class="hljs-value"><span class="hljs-number">0</span></span>,
    "<span class="hljs-attribute">value</span>":<span class="hljs-value">{
+      "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
       "<span class="hljs-attribute">input</span>":<span class="hljs-value">{
          "<span class="hljs-attribute">effect</span>":<span class="hljs-value"><span class="hljs-number">3</span></span>,
          "<span class="hljs-attribute">symbol</span>":<span class="hljs-value"><span class="hljs-string">"in1"</span></span>,
@@ -1615,6 +1624,7 @@ <h4 id="header-notification--6">Notification <code>on_connection_updated</code>
    "<span class="hljs-attribute">bank</span>":<span class="hljs-value"><span class="hljs-number">2</span></span>,
    "<span class="hljs-attribute">pedalboard</span>":<span class="hljs-value"><span class="hljs-number">0</span></span>,
    "<span class="hljs-attribute">value</span>":<span class="hljs-value">{
+      "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"audio"</span></span>,
       "<span class="hljs-attribute">input</span>":<span class="hljs-value">{
          "<span class="hljs-attribute">effect</span>":<span class="hljs-value"><span class="hljs-number">2</span></span>,
          "<span class="hljs-attribute">symbol</span>":<span class="hljs-value"><span class="hljs-string">"in_l"</span></span>,
@@ -1628,7 +1638,7 @@ <h4 id="header-notification--6">Notification <code>on_connection_updated</code>
 </span>}</code></pre>
 </li>
 </ul>
-</section></div><div class="middle"><p style="text-align: center;" class="text-muted">Generated by&nbsp;<a href="https://github.com/danielgtaylor/aglio" class="aglio">aglio</a>&nbsp;on 28 May 2017</p></div></div></div></div><script>/* eslint-env browser */
+</section></div><div class="middle"><p style="text-align: center;" class="text-muted">Generated by&nbsp;<a href="https://github.com/danielgtaylor/aglio" class="aglio">aglio</a>&nbsp;on 12 Mar 2018</p></div></div></div></div><script>/* eslint-env browser */
 /* eslint quotes: [2, "single"] */
 'use strict';
 
diff --git a/docs/section/bank_get.json b/docs/section/bank_get.json
index 34a6b79..bf2be7f 100644
--- a/docs/section/bank_get.json
+++ b/docs/section/bank_get.json
@@ -1 +1 @@
-{"index": 1, "pedalboards": [{"connections": [{"input": {"index": 0, "effect": 0, "symbol": "in"}, "output": {"index": 0, "symbol": "capture_1"}}, {"input": {"index": 0, "symbol": "playback_1"}, "output": {"index": 1, "effect": 0, "symbol": "out"}}], "data": {"pedalpi-apk": {"effectPositions": [{"y": 91.4995002746582, "x": 159.74801635742188}]}}, "effects": [{"active": true, "plugin": "http://drobilla.net/plugins/fomp/cs_chorus1", "technology": "lv2", "params": [{"index": 2, "value": 7.5, "minimum": 0.0, "maximum": 30.0, "symbol": "delay"}, {"index": 3, "value": 0.20000000298023224, "minimum": 0.003000000026077032, "maximum": 10.0, "symbol": "mod_freq_1"}, {"index": 4, "value": 2.5, "minimum": 0.0, "maximum": 10.0, "symbol": "mod_amp_1"}, {"index": 5, "value": 0.800000011920929, "minimum": 0.009999999776482582, "maximum": 30.0, "symbol": "mod_freq_2"}, {"index": 6, "value": 0.75, "minimum": 0.0, "maximum": 3.0, "symbol": "mod_amp_2"}]}], "name": "Empty pedalboard"}], "name": "My awesome bank"}
+{"index": 1, "pedalboards": [{"connections": [{"type": "audio", "input": {"index": 0, "effect": 0, "symbol": "in"}, "output": {"index": 0, "symbol": "capture_1"}}, {"type": "audio", "input": {"index": 0, "symbol": "playback_1"}, "output": {"index": 1, "effect": 0, "symbol": "out"}}], "data": {"pedalpi-apk": {"effectPositions": [{"y": 91.4995002746582, "x": 159.74801635742188}]}}, "effects": [{"active": true, "plugin": "http://drobilla.net/plugins/fomp/cs_chorus1", "technology": "lv2", "params": [{"index": 2, "value": 7.5, "minimum": 0.0, "maximum": 30.0, "symbol": "delay"}, {"index": 3, "value": 0.20000000298023224, "minimum": 0.003000000026077032, "maximum": 10.0, "symbol": "mod_freq_1"}, {"index": 4, "value": 2.5, "minimum": 0.0, "maximum": 10.0, "symbol": "mod_amp_1"}, {"index": 5, "value": 0.800000011920929, "minimum": 0.009999999776482582, "maximum": 30.0, "symbol": "mod_freq_2"}, {"index": 6, "value": 0.75, "minimum": 0.0, "maximum": 3.0, "symbol": "mod_amp_2"}]}], "name": "Empty pedalboard"}], "name": "My awesome bank"}
diff --git a/docs/section/connection.apib b/docs/section/connection.apib
index c66ee91..245c01d 100644
--- a/docs/section/connection.apib
+++ b/docs/section/connection.apib
@@ -13,13 +13,13 @@ Add a new connection between pedalboards
 + Request  (application/json; charset=UTF-8)
     + Body
 
-            {"output":{"effect":0,"symbol":"out","index":1},"input":{"symbol":"playback_2","index":1}}
+            {"type": "audio", "output":{"effect":0,"symbol":"out","index":1},"input":{"symbol":"playback_2","index":1}}
 + Response 200
 
 + Request  (application/json; charset=UTF-8)
     + Body
 
-            {"output":{"effect":0,"symbol":"out","index":1},"input":{"effect":1,"symbol":"in_l","index":0}}
+            {"type": "audio", "output":{"effect":0,"symbol":"out","index":1},"input":{"effect":1,"symbol":"in_l","index":0}}
 + Response 200
 
 ### Disconnect effects [PUT]
diff --git a/docs/section/websocket-examples/on_bank_updated.json b/docs/section/websocket-examples/on_bank_updated.json
index 7fb95a6..ecbca72 100644
--- a/docs/section/websocket-examples/on_bank_updated.json
+++ b/docs/section/websocket-examples/on_bank_updated.json
@@ -2,8 +2,9 @@
   "type":"BANK",
   "updateType":"DELETED",
   "bank":3,
-   "value":{
+  "value": {
       "name":"My bank",
+      "index":3,
       "pedalboards":[
          {
             "data":{
@@ -15,6 +16,7 @@
             "name":"Empty pedalboard",
             "connections":[
                {
+                  "type": "audio",
                   "input":{
                      "symbol":"playback_1",
                      "index":0
@@ -26,7 +28,6 @@
                }
             ]
          }
-      ],
-      "index":3
+      ]
    }
 }
diff --git a/docs/section/websocket-examples/on_connection_updated_1.json b/docs/section/websocket-examples/on_connection_updated_1.json
index bf4b551..7d9ae53 100644
--- a/docs/section/websocket-examples/on_connection_updated_1.json
+++ b/docs/section/websocket-examples/on_connection_updated_1.json
@@ -4,6 +4,7 @@
    "bank":2,
    "pedalboard":0,
    "value":{
+      "type": "audio",
       "input":{
          "effect":3,
          "symbol":"in1",
diff --git a/docs/section/websocket-examples/on_connection_updated_2.json b/docs/section/websocket-examples/on_connection_updated_2.json
index d8b0e09..7bdc26d 100644
--- a/docs/section/websocket-examples/on_connection_updated_2.json
+++ b/docs/section/websocket-examples/on_connection_updated_2.json
@@ -4,6 +4,7 @@
    "bank":2,
    "pedalboard":0,
    "value":{
+      "type": "audio",
       "input":{
          "effect":2,
          "symbol":"in_l",
diff --git a/docs/section/websocket-examples/on_current_pedalboard_changed.json b/docs/section/websocket-examples/on_current_pedalboard_changed.json
index d7dd108..4d0ddfb 100644
--- a/docs/section/websocket-examples/on_current_pedalboard_changed.json
+++ b/docs/section/websocket-examples/on_current_pedalboard_changed.json
@@ -93,6 +93,7 @@
       "name":"hehueuhes ea",
       "connections":[
          {
+            "type": "audio",
             "input":{
                "effect":0,
                "symbol":"in_l",
@@ -104,6 +105,7 @@
             }
          },
          {
+            "type": "audio",
             "input":{
                "symbol":"playback_1",
                "index":0
diff --git a/docs/section/websocket-examples/on_pedalboard_updated.json b/docs/section/websocket-examples/on_pedalboard_updated.json
index 64bb142..c0c0f05 100644
--- a/docs/section/websocket-examples/on_pedalboard_updated.json
+++ b/docs/section/websocket-examples/on_pedalboard_updated.json
@@ -17,6 +17,7 @@
       "name":"Guitar hero",
       "connections":[
          {
+            "type": "audio",
             "input":{
                "symbol":"playback_1",
                "index":0
diff --git a/makefile b/makefile
new file mode 100644
index 0000000..7fbde4d
--- /dev/null
+++ b/makefile
@@ -0,0 +1,92 @@
+BROWSER=firefox
+BOLD=\033[1m
+NORMAL=\033[0m
+
+default: help
+
+clean: clean-pyc clean-test clean-build clean-docs
+
+clean-build:
+	rm -rf .eggs
+	rm -rf build
+	rm -rf dist
+
+clean-pyc:
+	find . -name '*.pyc' -exec rm --force {} +
+	find . -name '*.pyo' -exec rm --force {} +
+
+clean-test:
+	rm -rf .cache
+	rm -f .coverage
+	rm -rf htmlcov
+	rm -rf wstest/data
+
+clean-docs:
+	rm -f docs/index.html
+
+docs: clean-docs
+	cd docs && aglio -i documentation.apib --theme-variables streak --theme-template triple -o index.html
+
+docs-see: docs
+	$(BROWSER) docs/index.html
+
+install-develop-requirements:
+	sudo apt-get install -y portaudio19-dev python-all-dev --no-install-recommends
+	sudo apt-get install -y lilv-utils calf-plugins guitarix --no-install-recommends
+	sudo apt-get install -y libavahi-compat-libdnssd1 --no-install-recommends
+	pip3 install -U setuptools
+	pip3 install git+https://github.com/depl0y/pybonjour-python3
+	pip3 install zeroconf
+
+install-docs-requirements:
+	npm install -g aglio
+
+install-tests-requirements:
+	pip3 install coveralls
+	# For midi tests - https://github.com/x42/midifilter.lv2
+	#cd /tmp && git clone git://github.com/x42/midifilter.lv2.git && \
+	#cd midifilter.lv2 && \
+	#make && \
+	#sudo make install PREFIX=/usr
+
+run:
+	@echo "Run option isn't created =)"
+
+test: clean-test
+	coverage3 run --source=webservice wstest/config.py test
+
+not-implemented-test-docs:
+	python -m doctest *.rst -v
+	python -m doctest docs/*/*.rst -v
+
+test-details: test
+	coverage3 html
+	$(BROWSER) htmlcov/index.html
+
+help: cabecalho
+	@echo ""
+	@echo "Commands"
+	@echo "    $(BOLD)clean$(NORMAL)"
+	@echo "          Clean files"
+	@echo "    $(BOLD)docs$(NORMAL)"
+	@echo "          Make the docs"
+	@echo "    $(BOLD)docs-see$(NORMAL)"
+	@echo "          Make the docs and open it in BROWSER"
+	@echo "    $(BOLD)install-docs-requirements$(NORMAL)"
+	@echo "          Install the docs requirements"
+	@echo "    $(BOLD)install-tests-requirements$(NORMAL)"
+	@echo "          Install the tests requirements"
+	@echo "    $(BOLD)test$(NORMAL)"
+	@echo "          Execute the tests"
+	@echo "    $(BOLD)test-details$(NORMAL)"
+	@echo "          Execute the tests and shows the result in BROWSER"
+	@echo "           - BROWSER=firefox"
+	@echo "    $(BOLD)help$(NORMAL)"
+	@echo "          Show the valid commands"
+
+cabecalho:
+	@echo "$(BOLD) _  _ ____ ____  ____ ____ ____  _  _ __ ___ ____"
+	@echo "/ )( (  __|  _ \/ ___|  __|  _ \/ )( (  ) __|  __)"
+	@echo "\ /\ /) _) ) _ (\___ \) _) )   /\ \/ /)( (__ ) _) "
+	@echo "(_/\_|____|____/(____(____|__\_) \__/(__)___|____)"
+	@echo "Link$(NORMAL): https://pypi.org/project/PedalPi-WebService/"
diff --git a/setup.py b/setup.py
index dc54ea7..7ba5cee 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def readme():
 
 setup(
     name='PedalPi-WebService',
-    version='0.3.0',
+    version='0.4.0',
 
     description='WebService (REST and WebSocket) to access and controller your Pedal Pi pedals set configurations',
     long_description=readme(),
@@ -49,15 +49,15 @@ def readme():
     package_data={},
 
     install_requires=[
-        'PedalPi-Application>=0.3.0',
-        'tornado>=4.4.2',
+        'PedalPi-Application==0.4.0',
+        'tornado>=4.5.3',
         'tornado-cors==0.6.0',
         'zeroconf'
     ],
 
     test_suite='wstest',
     tests_requires=[
-        'PedalPi-Application>=0.3.0',
+        'PedalPi-Application==0.4.0',
         'requests==2.11.1'
     ],
 
diff --git a/webservice/handler/bank_handler.py b/webservice/handler/bank_handler.py
index d6f71a3..f0dbdaa 100644
--- a/webservice/handler/bank_handler.py
+++ b/webservice/handler/bank_handler.py
@@ -32,7 +32,7 @@ def initialize(self, app, webservice):
         self._decoder = PersistenceDecoder(sys_effect)
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index')
     def get(self, bank_index):
         bank = self._manager.banks[bank_index]
@@ -50,7 +50,7 @@ def post(self):
         self.created({"index": bank.index})
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index')
     def put(self, bank_index):
         json = self.request_data
@@ -62,7 +62,7 @@ def put(self, bank_index):
         self.success()
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index')
     def delete(self, bank_index):
         bank_index = int(bank_index)
diff --git a/webservice/handler/connection_handler.py b/webservice/handler/connection_handler.py
index 7fa0231..58fbc49 100644
--- a/webservice/handler/connection_handler.py
+++ b/webservice/handler/connection_handler.py
@@ -12,12 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from webservice.handler.abstract_request_handler import AbstractRequestHandler
-from webservice.util.handler_utils import integer
-
 from application.controller.device_controller import DeviceController
-
 from pluginsmanager.util.persistence_decoder import ConnectionReader
+from webservice.handler.abstract_request_handler import AbstractRequestHandler
+from webservice.util.handler_utils import integer, exception
 
 
 class ConnectionHandler(AbstractRequestHandler):
@@ -28,17 +26,19 @@ def initialize(self, app, webservice):
 
         self._manager = app.manager
 
+    @exception(Exception, 400)
     @integer('bank_index', 'pedalboard_index')
     def put(self, bank_index, pedalboard_index):
         bank = self._manager.banks[bank_index]
         pedalboard = bank.pedalboards[pedalboard_index]
 
-        connection = ConnectionReader(pedalboard, DeviceController.sys_effect).read(self.request_data)
+        output_port, input_port = ConnectionReader(pedalboard, DeviceController.sys_effect).read(self.request_data)
         with self.observer:
-            pedalboard.connections.append(connection)
+            pedalboard.connect(output_port, input_port)
 
         self.send(200)
 
+    @exception(Exception, 400)
     @integer('bank_index', 'pedalboard_index')
     def post(self, bank_index, pedalboard_index):
         """
@@ -47,8 +47,8 @@ def post(self, bank_index, pedalboard_index):
         bank = self._manager.banks[bank_index]
         pedalboard = bank.pedalboards[pedalboard_index]
 
-        connection = ConnectionReader(pedalboard, DeviceController.sys_effect).read(self.request_data)
+        output_port, input_port = ConnectionReader(pedalboard, DeviceController.sys_effect).read(self.request_data)
         with self.observer:
-            pedalboard.connections.remove(connection)
+            pedalboard.disconnect(output_port, input_port)
 
         self.send(200)
diff --git a/webservice/handler/effect_handler.py b/webservice/handler/effect_handler.py
index fd44530..d85ef47 100644
--- a/webservice/handler/effect_handler.py
+++ b/webservice/handler/effect_handler.py
@@ -29,7 +29,7 @@ def initialize(self, app, webservice):
         self._plugins = self.app.controller(PluginsController)
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index', 'effect_index')
     def get(self, bank_index, pedalboard_index, effect_index):
         effect = self._manager.banks[bank_index].pedalboards[pedalboard_index].effects[effect_index]
@@ -37,7 +37,7 @@ def get(self, bank_index, pedalboard_index, effect_index):
         return self.write(effect.json)
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index')
     def post(self, bank_index, pedalboard_index):
         pedalboard = self._manager.banks[bank_index].pedalboards[pedalboard_index]
@@ -50,7 +50,7 @@ def post(self, bank_index, pedalboard_index):
         return self.created({"index": effect.index, "effect": effect.json})
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index', 'effect_index')
     def delete(self, bank_index, pedalboard_index, effect_index):
         pedalboard = self._manager.banks[bank_index].pedalboards[pedalboard_index]
diff --git a/webservice/handler/param_handler.py b/webservice/handler/param_handler.py
index 2b8291e..c938d16 100644
--- a/webservice/handler/param_handler.py
+++ b/webservice/handler/param_handler.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from pluginsmanager.model.param import ParamError
 from webservice.handler.abstract_request_handler import AbstractRequestHandler
 from webservice.util.handler_utils import integer, exception
 
@@ -25,7 +26,7 @@ def initialize(self, app, webservice):
         self._manager = self.app.manager
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index', 'effect_index', 'param_index')
     def get(self, bank_index, pedalboard_index, effect_index, param_index):
         bank = self._manager.banks[bank_index]
@@ -34,7 +35,8 @@ def get(self, bank_index, pedalboard_index, effect_index, param_index):
         return self.write(param.json)
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(ParamError, 400)
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index', 'effect_index', 'param_index')
     def put(self, bank_index, pedalboard_index, effect_index, param_index):
         bank = self._manager.banks[bank_index]
diff --git a/webservice/handler/pedalboard_data_handler.py b/webservice/handler/pedalboard_data_handler.py
index 2e95865..88e5686 100644
--- a/webservice/handler/pedalboard_data_handler.py
+++ b/webservice/handler/pedalboard_data_handler.py
@@ -26,7 +26,7 @@ def initialize(self, app, webservice):
         self._manager = self.app.manager
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, error_message=True)
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index')
     def get(self, bank_index, pedalboard_index, key):
         bank = self._manager.banks[bank_index]
@@ -38,7 +38,7 @@ def get(self, bank_index, pedalboard_index, key):
         return self.write(pedalboard.data[key])
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, error_message=True)
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index')
     def put(self, bank_index, pedalboard_index, key):
         bank = self._manager.banks[bank_index]
@@ -50,7 +50,7 @@ def put(self, bank_index, pedalboard_index, key):
                 pedalboard,
                 UpdateType.UPDATED,
                 index=pedalboard_index,
-                origin=bank_index,
+                origin=bank,
                 old=pedalboard
             )
 
diff --git a/webservice/handler/pedalboard_handler.py b/webservice/handler/pedalboard_handler.py
index 20f22cc..c32c46a 100644
--- a/webservice/handler/pedalboard_handler.py
+++ b/webservice/handler/pedalboard_handler.py
@@ -32,7 +32,7 @@ def initialize(self, app, webservice):
         self._decode = PedalboardReader(self.app.controller(DeviceController).sys_effect)
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index')
     def get(self, bank_index, pedalboard_index):
         bank = self._manager.banks[bank_index]
@@ -41,7 +41,7 @@ def get(self, bank_index, pedalboard_index):
         return self.write(pedalboard.json)
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index')
     def post(self, bank_index):
         pedalboard = self._decode.read(self.request_data)
@@ -53,7 +53,7 @@ def post(self, bank_index):
         return self.created({"index": len(bank.pedalboards) - 1})
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index')
     def put(self, bank_index, pedalboard_index):
         bank = self._manager.banks[bank_index]
@@ -65,7 +65,7 @@ def put(self, bank_index, pedalboard_index):
         return self.success()
 
     @exception(Exception, 500)
-    @exception(IndexError, 400, message='Invalid index')
+    @exception(IndexError, 400)
     @integer('bank_index', 'pedalboard_index')
     def delete(self, bank_index, pedalboard_index):
         bank = self._manager.banks[bank_index]
diff --git a/webservice/util/handler_utils.py b/webservice/util/handler_utils.py
index 5b854f3..70b27d5 100644
--- a/webservice/util/handler_utils.py
+++ b/webservice/util/handler_utils.py
@@ -44,7 +44,7 @@ class exception(object):
     :param bool error_message: Show raised error instead a defined message
     """
 
-    def __init__(self, error, status_code, message=None, error_message=False):
+    def __init__(self, error, status_code, message=None, error_message=True):
         self.error = error
         self.status_code = status_code
         self.message = message
diff --git a/webservice/webservice.py b/webservice/webservice.py
index a35466d..d505cb3 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -49,7 +49,7 @@ class WebService(Component):
     For more details, see http://pedalpi.github.io/WebService.
     """
 
-    def __init__(self, application, port):
+    def __init__(self, application, port=3000):
         super().__init__(application)
 
         self.handlers = []
diff --git a/webservice/websocket/websocket_connection_observer.py b/webservice/websocket/websocket_connection_observer.py
index 18d78e1..cd2e62c 100644
--- a/webservice/websocket/websocket_connection_observer.py
+++ b/webservice/websocket/websocket_connection_observer.py
@@ -14,8 +14,6 @@
 
 from application.component.application_observer import ApplicationObserver
 
-from webservice.websocket.web_socket_connections import WebSocketConnections
-
 
 class WebSocketConnectionObserver(ApplicationObserver):
 
diff --git a/wstest/handler/bank_handler_test.py b/wstest/handler/bank_handler_test.py
index bbc8565..a66e954 100644
--- a/wstest/handler/bank_handler_test.py
+++ b/wstest/handler/bank_handler_test.py
@@ -25,7 +25,7 @@ def generic_test_index_error(self, method):
 
     def assertIndexError(self, response):
         self.assertEqual(Test.ERROR, response.status_code)
-        self.assertEqual('Invalid index', response.json()['error'])
+        self.assertEqual('list index out of range', response.json()['error'])
 
     def test_get(self):
         bank = self.default_bank_mock
diff --git a/wstest/handler/connection_handler_test.py b/wstest/handler/connection_handler_test.py
index b8ea7e6..cde0b43 100644
--- a/wstest/handler/connection_handler_test.py
+++ b/wstest/handler/connection_handler_test.py
@@ -15,6 +15,7 @@
 from wstest.handler.handler_test import Test
 from pluginsmanager.model.connection import Connection
 
+
 class ConnectionHandlerTest(Test):
 
     def test_put(self):
@@ -35,6 +36,20 @@ def test_put(self):
 
         self.rest.delete_bank(bank)
 
+    def test_put_connection_without_type(self):
+        bank = self.default_bank_mock
+        bank.index = self.rest.create_bank(bank).json()['index']
+
+        pedalboard = bank.pedalboards[0]
+        reverb, reverb2 = pedalboard.effects
+        connection = Connection(reverb2.outputs[0], reverb.inputs[0])
+        pedalboard.connections.append(connection)
+
+        response = self.rest.create_connection_without_type(connection)
+        self.assertEqual(Test.ERROR, response.status_code)
+
+        self.rest.delete_bank(bank)
+
     def test_post_is_delete(self):
         bank = self.default_bank_mock
         bank.index = self.rest.create_bank(bank).json()['index']
diff --git a/wstest/handler/handler_test.py b/wstest/handler/handler_test.py
index db36edf..e86ee9e 100644
--- a/wstest/handler/handler_test.py
+++ b/wstest/handler/handler_test.py
@@ -56,7 +56,7 @@ def default_bank_mock(self):
         pedalboard.append(reverb)
         pedalboard.append(reverb2)
 
-        reverb.outputs[0].connect(reverb2.inputs[0])
+        pedalboard.connect(reverb.outputs[0], reverb2.inputs[0])
 
         return bank
 
diff --git a/wstest/handler/param_handler_test.py b/wstest/handler/param_handler_test.py
index af33b49..941d0dd 100644
--- a/wstest/handler/param_handler_test.py
+++ b/wstest/handler/param_handler_test.py
@@ -43,3 +43,18 @@ def test_put(self):
         self.assertEqual(param.json, get_value.json())
 
         self.rest.delete_bank(bank)
+
+    def test_put_wrong_value(self):
+        bank = self.default_bank_mock
+        bank.index = self.rest.create_bank(bank).json()['index']
+
+        param = bank.pedalboards[0].effects[0].params[0]
+
+        response = self.rest.put_param_value_wrong_value(param, 10000)
+        self.assertEqual(Test.ERROR, response.status_code)
+
+        # Not changed the param value
+        get_value = self.rest.get_param(param)
+        self.assertEqual(param.json, get_value.json())
+
+        self.rest.delete_bank(bank)
diff --git a/wstest/rest_facade.py b/wstest/rest_facade.py
index 62aa1cc..4b8760e 100644
--- a/wstest/rest_facade.py
+++ b/wstest/rest_facade.py
@@ -141,6 +141,10 @@ def put_param(self, param):
         url = self._url_param(param)
         return self.put(url, param.value)
 
+    def put_param_value_wrong_value(self, param, param_value):
+        url = self._url_param(param)
+        return self.put(url, param_value)
+
     def _url_param(self, param):
         effect = param.effect
         pedalboard = effect.pedalboard
@@ -159,6 +163,11 @@ def _url_param(self, param):
     def create_connection(self, connection):
         return self.put(self._url_connection(connection), connection.json)
 
+    def create_connection_without_type(self, connection):
+        data = connection.json
+        del data['type']
+        return self.put(self._url_connection(connection), data)
+
     def delete_connection(self, connection):
         return self.post(self._url_connection(connection), connection.json)