From 2c73d40551a48826b2f6f1c917c6acbb5c7484e4 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@gns3.net>
Date: Tue, 27 Sep 2016 17:15:40 +0200
Subject: [PATCH] Update documentations

---
 .../compute_delete_projectsprojectid.txt      |   9 +-
 ...lete_projectsprojectidcloudnodesnodeid.txt |  13 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  13 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  13 +-
 ...delete_projectsprojectidiounodesnodeid.txt |  13 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  13 +-
 ...delete_projectsprojectidnatnodesnodeid.txt |  13 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  13 +-
 ...elete_projectsprojectidqemunodesnodeid.txt |  13 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  13 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  13 +-
 ...elete_projectsprojectidvpcsnodesnodeid.txt |  13 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  13 +-
 .../api/examples/compute_get_capabilities.txt |  10 +-
 docs/api/examples/compute_get_iouimages.txt   |  10 +-
 .../compute_get_networkinterfaces.txt         |  99 ++-
 docs/api/examples/compute_get_projects.txt    |  14 +-
 .../compute_get_projectsprojectid.txt         |  10 +-
 ..._get_projectsprojectidcloudnodesnodeid.txt |  94 +-
 ...te_get_projectsprojectidiounodesnodeid.txt |  20 +-
 ...te_get_projectsprojectidnatnodesnodeid.txt |  22 +-
 ...e_get_projectsprojectidqemunodesnodeid.txt |  24 +-
 ...projectsprojectidvirtualboxnodesnodeid.txt |  18 +-
 ...e_get_projectsprojectidvpcsnodesnodeid.txt |  20 +-
 .../api/examples/compute_get_qemubinaries.txt |  10 +-
 .../examples/compute_get_qemucapabilities.txt |  10 +-
 docs/api/examples/compute_get_version.txt     |  10 +-
 docs/api/examples/compute_post_projects.txt   |  10 +-
 .../compute_post_projectsprojectidclose.txt   |   9 +-
 ...mpute_post_projectsprojectidcloudnodes.txt |  90 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  14 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  14 +-
 ...ternumberdportsportnumberdstartcapture.txt |  16 +-
 ...pternumberdportsportnumberdstopcapture.txt |  13 +-
 ...compute_post_projectsprojectidiounodes.txt |  20 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  14 +-
 ...ternumberdportsportnumberdstartcapture.txt |  16 +-
 ...pternumberdportsportnumberdstopcapture.txt |  13 +-
 ..._projectsprojectidiounodesnodeidreload.txt |  13 +-
 ...t_projectsprojectidiounodesnodeidstart.txt |  20 +-
 ...st_projectsprojectidiounodesnodeidstop.txt |  13 +-
 ...compute_post_projectsprojectidnatnodes.txt |  18 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  14 +-
 ...compute_post_projectsprojectidportsudp.txt |  10 +-
 ...ompute_post_projectsprojectidqemunodes.txt |  24 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  14 +-
 ...projectsprojectidqemunodesnodeidreload.txt |  13 +-
 ...projectsprojectidqemunodesnodeidresume.txt |  13 +-
 ..._projectsprojectidqemunodesnodeidstart.txt |  24 +-
 ...t_projectsprojectidqemunodesnodeidstop.txt |  13 +-
 ...rojectsprojectidqemunodesnodeidsuspend.txt |  13 +-
 ..._post_projectsprojectidvirtualboxnodes.txt |  14 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  14 +-
 ...tsprojectidvirtualboxnodesnodeidreload.txt |  13 +-
 ...tsprojectidvirtualboxnodesnodeidresume.txt |  13 +-
 ...ctsprojectidvirtualboxnodesnodeidstart.txt |  13 +-
 ...ectsprojectidvirtualboxnodesnodeidstop.txt |  13 +-
 ...sprojectidvirtualboxnodesnodeidsuspend.txt |  13 +-
 ...ompute_post_projectsprojectidvpcsnodes.txt |  16 +-
 ...ptersadapternumberdportsportnumberdnio.txt |  14 +-
 ...projectsprojectidvpcsnodesnodeidreload.txt |  13 +-
 ..._projectsprojectidvpcsnodesnodeidstart.txt |  20 +-
 ...t_projectsprojectidvpcsnodesnodeidstop.txt |  13 +-
 docs/api/examples/compute_post_qemuimg.txt    |   9 +-
 ..._put_projectsprojectidcloudnodesnodeid.txt |  94 +-
 ...put_projectsprojectiddockernodesnodeid.txt |  24 +-
 ...te_put_projectsprojectidiounodesnodeid.txt |  22 +-
 ...te_put_projectsprojectidnatnodesnodeid.txt |  22 +-
 ...e_put_projectsprojectidqemunodesnodeid.txt |  26 +-
 ...projectsprojectidvirtualboxnodesnodeid.txt |  20 +-
 ...e_put_projectsprojectidvpcsnodesnodeid.txt |  22 +-
 .../controller_delete_projectsprojectid.txt   |  13 +-
 ...ete_projectsprojectiddrawingsdrawingid.txt |  13 +-
 ...er_delete_projectsprojectidlinkslinkid.txt |  13 +-
 ...er_delete_projectsprojectidnodesnodeid.txt |  13 +-
 ...e_projectsprojectidsnapshotssnapshotid.txt |  13 +-
 docs/api/examples/controller_get_computes.txt |  10 +-
 .../controller_get_computescomputeid.txt      |  10 +-
 ...er_get_computescomputeidemulatorimages.txt |  10 +-
 docs/api/examples/controller_get_gns3vm.txt   |  12 +-
 .../examples/controller_get_gns3vmengines.txt |  13 +-
 .../controller_get_gns3vmenginesenginevms.txt |  10 +-
 docs/api/examples/controller_get_projects.txt |  14 +-
 .../controller_get_projectsprojectid.txt      |  20 +-
 ...ntroller_get_projectsprojectiddrawings.txt |  18 +-
 .../controller_get_projectsprojectidlinks.txt |  23 +-
 .../controller_get_projectsprojectidnodes.txt |  18 +-
 ...oller_get_projectsprojectidnodesnodeid.txt |  57 ++
 ...projectidnodesnodeiddynamipsautoidlepc.txt |  14 +-
 ...ctidnodesnodeiddynamipsidlepcproposals.txt |  14 +-
 ...troller_get_projectsprojectidsnapshots.txt |  20 +-
 docs/api/examples/controller_get_settings.txt |  10 +-
 docs/api/examples/controller_get_symbols.txt  |  10 +-
 docs/api/examples/controller_get_version.txt  |  10 +-
 .../api/examples/controller_post_computes.txt |  10 +-
 .../api/examples/controller_post_projects.txt |  14 +-
 .../examples/controller_post_projectsload.txt |  16 +-
 ...controller_post_projectsprojectidclose.txt |  20 +-
 ...troller_post_projectsprojectiddrawings.txt |  18 +-
 ...roller_post_projectsprojectidduplicate.txt |  20 +-
 ...controller_post_projectsprojectidlinks.txt |  27 +-
 ...ojectsprojectidlinkslinkidstartcapture.txt |  19 +-
 ...rojectsprojectidlinkslinkidstopcapture.txt |  19 +-
 ...controller_post_projectsprojectidnodes.txt |  18 +-
 ...ost_projectsprojectidnodesnodeidreload.txt |  18 +-
 ...post_projectsprojectidnodesnodeidstart.txt |  18 +-
 ..._post_projectsprojectidnodesnodeidstop.txt |  18 +-
 ...st_projectsprojectidnodesnodeidsuspend.txt |  18 +-
 ...ller_post_projectsprojectidnodesreload.txt |  13 +-
 ...oller_post_projectsprojectidnodesstart.txt |  13 +-
 ...roller_post_projectsprojectidnodesstop.txt |  13 +-
 ...ler_post_projectsprojectidnodessuspend.txt |  13 +-
 .../controller_post_projectsprojectidopen.txt |  20 +-
 ...roller_post_projectsprojectidsnapshots.txt |  20 +-
 ...ctsprojectidsnapshotssnapshotidrestore.txt |  20 +-
 .../api/examples/controller_post_settings.txt |  10 +-
 .../api/examples/controller_post_shutdown.txt |   9 +-
 docs/api/examples/controller_post_version.txt |  10 +-
 .../controller_put_computescomputeid.txt      |  10 +-
 docs/api/examples/controller_put_gns3vm.txt   |  10 +-
 .../controller_put_projectsprojectid.txt      |  14 +-
 ...put_projectsprojectiddrawingsdrawingid.txt |  18 +-
 ...oller_put_projectsprojectidnodesnodeid.txt |  18 +-
 docs/api/notifications/compute.updated.json   |  33 +-
 docs/api/notifications/drawing.created.json   |   4 +-
 docs/api/notifications/drawing.deleted.json   |   4 +-
 docs/api/notifications/drawing.updated.json   |   4 +-
 docs/api/notifications/link.created.json      |   9 +-
 docs/api/notifications/link.deleted.json      |   5 +-
 docs/api/notifications/link.updated.json      |   9 +-
 docs/api/notifications/node.deleted.json      |   4 +-
 docs/api/notifications/node.updated.json      |   4 +-
 docs/api/notifications/project.closed.json    |   6 +-
 docs/api/notifications/project.updated.json   |   4 +-
 docs/api/notifications/snapshot.restored.json |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 .../projectsprojectidatmswitchnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...ectsprojectidatmswitchnodesnodeidstart.rst |   2 +-
 ...jectsprojectidatmswitchnodesnodeidstop.rst |   2 +-
 ...tsprojectidatmswitchnodesnodeidsuspend.rst |   2 +-
 .../cloud/projectsprojectidcloudnodes.rst     |   1 +
 .../projectsprojectidcloudnodesnodeid.rst     |   7 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...projectsprojectidcloudnodesnodeidstart.rst |   2 +-
 .../projectsprojectidcloudnodesnodeidstop.rst |   2 +-
 ...ojectsprojectidcloudnodesnodeidsuspend.rst |   2 +-
 .../projectsprojectiddockernodesnodeid.rst    |   4 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...rojectsprojectiddockernodesnodeidpause.rst |   2 +-
 ...ojectsprojectiddockernodesnodeidreload.rst |   2 +-
 ...rojectsprojectiddockernodesnodeidstart.rst |   2 +-
 ...projectsprojectiddockernodesnodeidstop.rst |   2 +-
 ...jectsprojectiddockernodesnodeidunpause.rst |   2 +-
 .../projectsprojectiddynamipsnodes.rst        |   6 +-
 .../projectsprojectiddynamipsnodesnodeid.rst  |  16 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...projectiddynamipsnodesnodeidautoidlepc.rst |   2 +-
 ...ctiddynamipsnodesnodeididlepcproposals.rst |   2 +-
 ...ectsprojectiddynamipsnodesnodeidreload.rst |   2 +-
 ...ectsprojectiddynamipsnodesnodeidresume.rst |   2 +-
 ...jectsprojectiddynamipsnodesnodeidstart.rst |   2 +-
 ...ojectsprojectiddynamipsnodesnodeidstop.rst |   2 +-
 ...ctsprojectiddynamipsnodesnodeidsuspend.rst |   2 +-
 ...rojectsprojectidethernethubnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...tsprojectidethernethubnodesnodeidstart.rst |   2 +-
 ...ctsprojectidethernethubnodesnodeidstop.rst |   2 +-
 ...projectidethernethubnodesnodeidsuspend.rst |   2 +-
 ...ectsprojectidethernetswitchnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...rojectidethernetswitchnodesnodeidstart.rst |   2 +-
 ...projectidethernetswitchnodesnodeidstop.rst |   2 +-
 ...jectidethernetswitchnodesnodeidsuspend.rst |   2 +-
 ...tsprojectidframerelayswitchnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...jectidframerelayswitchnodesnodeidstart.rst |   2 +-
 ...ojectidframerelayswitchnodesnodeidstop.rst |   2 +-
 ...ctidframerelayswitchnodesnodeidsuspend.rst |   2 +-
 .../iou/projectsprojectidiounodesnodeid.rst   |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 .../projectsprojectidiounodesnodeidreload.rst |   2 +-
 .../projectsprojectidiounodesnodeidstart.rst  |   2 +-
 .../projectsprojectidiounodesnodeidstop.rst   |   2 +-
 .../nat/projectsprojectidnatnodesnodeid.rst   |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 .../projectsprojectidnatnodesnodeidstart.rst  |   2 +-
 .../projectsprojectidnatnodesnodeidstop.rst   |   2 +-
 ...projectsprojectidnatnodesnodeidsuspend.rst |   2 +-
 docs/api/v2/compute/project/projects.rst      |   4 +
 .../v2/compute/project/projectsprojectid.rst  |   2 +
 .../project/projectsprojectidimport.rst       |   2 +
 .../qemu/projectsprojectidqemunodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...projectsprojectidqemunodesnodeidreload.rst |   2 +-
 ...projectsprojectidqemunodesnodeidresume.rst |   2 +-
 .../projectsprojectidqemunodesnodeidstart.rst |   2 +-
 .../projectsprojectidqemunodesnodeidstop.rst  |   2 +-
 ...rojectsprojectidqemunodesnodeidsuspend.rst |   2 +-
 ...projectsprojectidvirtualboxnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...tsprojectidvirtualboxnodesnodeidreload.rst |   2 +-
 ...tsprojectidvirtualboxnodesnodeidresume.rst |   2 +-
 ...ctsprojectidvirtualboxnodesnodeidstart.rst |   2 +-
 ...ectsprojectidvirtualboxnodesnodeidstop.rst |   2 +-
 ...sprojectidvirtualboxnodesnodeidsuspend.rst |   2 +-
 .../projectsprojectidvmwarenodesnodeid.rst    |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...jectidvmwarenodesnodeidinterfacesvmnet.rst |   2 +-
 ...ojectsprojectidvmwarenodesnodeidreload.rst |   2 +-
 ...ojectsprojectidvmwarenodesnodeidresume.rst |   2 +-
 ...rojectsprojectidvmwarenodesnodeidstart.rst |   2 +-
 ...projectsprojectidvmwarenodesnodeidstop.rst |   2 +-
 ...jectsprojectidvmwarenodesnodeidsuspend.rst |   2 +-
 .../vpcs/projectsprojectidvpcsnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |   8 +-
 ...ternumberdportsportnumberdstartcapture.rst |   4 +-
 ...pternumberdportsportnumberdstopcapture.rst |   4 +-
 ...projectsprojectidvpcsnodesnodeidreload.rst |   2 +-
 .../projectsprojectidvpcsnodesnodeidstart.rst |   2 +-
 .../projectsprojectidvpcsnodesnodeidstop.rst  |   2 +-
 ...rojectsprojectidvpcsnodesnodeidsuspend.rst |   2 +-
 .../projectsprojectiddrawingsdrawingid.rst    |   4 +-
 .../link/projectsprojectidlinks.rst           |   2 +
 .../link/projectsprojectidlinkslinkid.rst     |   2 +
 ...ojectsprojectidlinkslinkidstartcapture.rst |   1 +
 .../node/projectsprojectidnodesnodeid.rst     |  50 +-
 ...projectidnodesnodeiddynamipsautoidlepc.rst |   2 +-
 ...ctidnodesnodeiddynamipsidlepcproposals.rst |   2 +-
 .../projectsprojectidnodesnodeidfilespath.rst |   4 +-
 .../projectsprojectidnodesnodeidreload.rst    |   2 +-
 .../projectsprojectidnodesnodeidstart.rst     |   2 +-
 .../node/projectsprojectidnodesnodeidstop.rst |   2 +-
 .../projectsprojectidnodesnodeidsuspend.rst   |   2 +-
 docs/api/v2/controller/project/projects.rst   |   4 +
 .../v2/controller/project/projectsload.rst    |   2 +
 .../controller/project/projectsprojectid.rst  |   4 +
 .../project/projectsprojectidclose.rst        |   2 +
 .../project/projectsprojectidduplicate.rst    |   4 +
 .../project/projectsprojectidimport.rst       |   2 +
 .../project/projectsprojectidopen.rst         |   2 +
 .../projectsprojectidsnapshotssnapshotid.rst  |   2 +-
 ...ctsprojectidsnapshotssnapshotidrestore.rst |   4 +-
 docs/gns3_file.json                           | 809 +++++++++---------
 267 files changed, 2085 insertions(+), 1530 deletions(-)
 create mode 100644 docs/api/examples/controller_get_projectsprojectidnodesnodeid.txt

diff --git a/docs/api/examples/compute_delete_projectsprojectid.txt b/docs/api/examples/compute_delete_projectsprojectid.txt
index 990fad88..1b437124 100644
--- a/docs/api/examples/compute_delete_projectsprojectid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectid.txt
@@ -5,8 +5,9 @@ DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80 HTTP/1.1
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:09 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeid.txt
index 50a4a77b..5595240e 100644
--- a/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/41e83f3d-8456-473f-8195-516a1f738801'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/b2962852-e0d1-4853-8775-0f2fde055070'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/41e83f3d-8456-473f-8195-516a1f738801 HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/b2962852-e0d1-4853-8775-0f2fde055070 HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:04 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 7205b86f..a7cf5aed 100644
--- a/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/77548610-5538-4f30-9de6-9104d2fb8370/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/acd457ac-8dcc-40e5-9488-3852cfd11b5b/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/77548610-5538-4f30-9de6-9104d2fb8370/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/acd457ac-8dcc-40e5-9488-3852cfd11b5b/adapters/0/ports/0/nio HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:03 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
diff --git a/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index a127cee3..d12726bc 100644
--- a/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2f12b49b-d282-419c-ab2e-94579b9d19c6/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/b913e4a7-a742-4b35-ab6a-4eb0dd071647/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2f12b49b-d282-419c-ab2e-94579b9d19c6/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/b913e4a7-a742-4b35-ab6a-4eb0dd071647/adapters/0/ports/0/nio HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:04 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt
index 9a76482c..24a4d1e4 100644
--- a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f97a8bd6-3799-452e-b3a3-d7fc4fd2f16f'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/11f8702c-ad8d-4d4d-92e1-36dc351fdcd2'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f97a8bd6-3799-452e-b3a3-d7fc4fd2f16f HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/11f8702c-ad8d-4d4d-92e1-36dc351fdcd2 HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:06 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 69f7d7bf..b0f7d75e 100644
--- a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/1fef5d59-4568-43c1-b7d5-5de22a145243/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/93c55439-b21b-4b96-b6b0-7655acba60f7/adapters/1/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/1fef5d59-4568-43c1-b7d5-5de22a145243/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/93c55439-b21b-4b96-b6b0-7655acba60f7/adapters/1/ports/0/nio HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:07 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeid.txt
index 4c614b43..8d18b5b7 100644
--- a/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/08932e82-3f90-44c6-aac9-f599a1fed13a'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/3ea3c44d-84d3-4e45-8222-e31898fdeaf5'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/08932e82-3f90-44c6-aac9-f599a1fed13a HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/3ea3c44d-84d3-4e45-8222-e31898fdeaf5 HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:08 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 231721c9..481d21f1 100644
--- a/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/a3ed88f8-6639-4655-b67b-423f20906e1a/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/35b8df58-f7c8-4129-99d0-5783b3d7308a/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/a3ed88f8-6639-4655-b67b-423f20906e1a/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/35b8df58-f7c8-4129-99d0-5783b3d7308a/adapters/0/ports/0/nio HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:08 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt
index ba2e6d76..a5bb50c5 100644
--- a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7e12bebe-49da-48c1-8ec1-cf63635029fd'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/d215e65d-106a-4bb2-97a1-ad203f82f33f'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7e12bebe-49da-48c1-8ec1-cf63635029fd HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/d215e65d-106a-4bb2-97a1-ad203f82f33f HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:11 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 226fd7ff..bf9a73c5 100644
--- a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/bdd1115c-ded9-4b2f-8560-d555bb12f643/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/327e074d-dffe-4164-9e85-cc27c9794680/adapters/1/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/bdd1115c-ded9-4b2f-8560-d555bb12f643/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/327e074d-dffe-4164-9e85-cc27c9794680/adapters/1/ports/0/nio HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:12 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index f409db82..c0d426e0 100644
--- a/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5edf41d8-1041-48d4-ba8b-c53695d59fc1/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/0eadcf1f-131a-485c-8001-15ae99ae9df5/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5edf41d8-1041-48d4-ba8b-c53695d59fc1/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/0eadcf1f-131a-485c-8001-15ae99ae9df5/adapters/0/ports/0/nio HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:14 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt
index 44dc6c4d..2f152576 100644
--- a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/0cb7dac8-87ec-4882-9062-2f4000a1653d'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2d59aa95-5971-438d-9e56-74d4e1632e56'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/0cb7dac8-87ec-4882-9062-2f4000a1653d HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2d59aa95-5971-438d-9e56-74d4e1632e56 HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:15 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index bd671099..cf2a7caf 100644
--- a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/bc9a8630-043d-473a-bfd4-0e5def6bdfb5/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/93d1c07e-515f-4981-be59-4ba61cbf9fb4/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/bc9a8630-043d-473a-bfd4-0e5def6bdfb5/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/93d1c07e-515f-4981-be59-4ba61cbf9fb4/adapters/0/ports/0/nio HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:15 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
diff --git a/docs/api/examples/compute_get_capabilities.txt b/docs/api/examples/compute_get_capabilities.txt
index b1144589..41953fe9 100644
--- a/docs/api/examples/compute_get_capabilities.txt
+++ b/docs/api/examples/compute_get_capabilities.txt
@@ -5,11 +5,11 @@ GET /v2/compute/capabilities HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 316
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/capabilities
+Content-Length: 316
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:03 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/capabilities
 
 {
     "node_types": [
diff --git a/docs/api/examples/compute_get_iouimages.txt b/docs/api/examples/compute_get_iouimages.txt
index 87c51ec2..f63ed084 100644
--- a/docs/api/examples/compute_get_iouimages.txt
+++ b/docs/api/examples/compute_get_iouimages.txt
@@ -5,11 +5,11 @@ GET /v2/compute/iou/images HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 72
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/iou/images
+Content-Length: 72
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:07 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/iou/images
 
 [
     {
diff --git a/docs/api/examples/compute_get_networkinterfaces.txt b/docs/api/examples/compute_get_networkinterfaces.txt
index 6195e33d..f43dfe05 100644
--- a/docs/api/examples/compute_get_networkinterfaces.txt
+++ b/docs/api/examples/compute_get_networkinterfaces.txt
@@ -5,11 +5,11 @@ GET /v2/compute/network/interfaces HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 3351
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/network/interfaces
+Content-Length: 5502
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:08 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/network/interfaces
 
 [
     {
@@ -18,6 +18,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "3e:07:54:87:bc:00",
         "name": "bridge0",
         "netmask": "",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -26,6 +27,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "3c:07:54:78:07:cc",
         "name": "en0",
         "netmask": "",
+        "special": false,
         "type": "ethernet"
     },
     {
@@ -34,6 +36,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "68:a8:6d:4a:c3:16",
         "name": "en1",
         "netmask": "255.255.255.0",
+        "special": false,
         "type": "ethernet"
     },
     {
@@ -42,6 +45,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "d2:00:1b:c0:17:80",
         "name": "en2",
         "netmask": "",
+        "special": false,
         "type": "ethernet"
     },
     {
@@ -50,6 +54,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "3c:07:54:ff:fe:bc:01:78",
         "name": "fw0",
         "netmask": "",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -58,6 +63,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "",
         "name": "lo0",
         "netmask": "255.0.0.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -66,6 +72,79 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "0a:a8:6d:4a:c3:16",
         "name": "p2p0",
         "netmask": "",
+        "special": true,
+        "type": "ethernet"
+    },
+    {
+        "id": "vboxnet0",
+        "ip_address": "172.16.43.1",
+        "mac_address": "0a:00:27:00:00:00",
+        "name": "vboxnet0",
+        "netmask": null,
+        "special": true,
+        "type": "ethernet"
+    },
+    {
+        "id": "vboxnet1",
+        "ip_address": "",
+        "mac_address": "0a:00:27:00:00:01",
+        "name": "vboxnet1",
+        "netmask": "",
+        "special": true,
+        "type": "ethernet"
+    },
+    {
+        "id": "vboxnet2",
+        "ip_address": "",
+        "mac_address": "0a:00:27:00:00:02",
+        "name": "vboxnet2",
+        "netmask": "",
+        "special": true,
+        "type": "ethernet"
+    },
+    {
+        "id": "vboxnet3",
+        "ip_address": "",
+        "mac_address": "0a:00:27:00:00:03",
+        "name": "vboxnet3",
+        "netmask": "",
+        "special": true,
+        "type": "ethernet"
+    },
+    {
+        "id": "vboxnet4",
+        "ip_address": "",
+        "mac_address": "0a:00:27:00:00:04",
+        "name": "vboxnet4",
+        "netmask": "",
+        "special": true,
+        "type": "ethernet"
+    },
+    {
+        "id": "vboxnet5",
+        "ip_address": "192.168.33.1",
+        "mac_address": "0a:00:27:00:00:05",
+        "name": "vboxnet5",
+        "netmask": null,
+        "special": true,
+        "type": "ethernet"
+    },
+    {
+        "id": "vboxnet6",
+        "ip_address": "",
+        "mac_address": "0a:00:27:00:00:06",
+        "name": "vboxnet6",
+        "netmask": "",
+        "special": true,
+        "type": "ethernet"
+    },
+    {
+        "id": "vboxnet7",
+        "ip_address": "",
+        "mac_address": "0a:00:27:00:00:07",
+        "name": "vboxnet7",
+        "netmask": "",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -74,6 +153,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:01",
         "name": "vmnet1",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -82,6 +162,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:0a",
         "name": "vmnet10",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -90,6 +171,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:02",
         "name": "vmnet2",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -98,6 +180,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:03",
         "name": "vmnet3",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -106,6 +189,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:04",
         "name": "vmnet4",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -114,6 +198,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:05",
         "name": "vmnet5",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -122,6 +207,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:06",
         "name": "vmnet6",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -130,6 +216,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:07",
         "name": "vmnet7",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -138,6 +225,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:08",
         "name": "vmnet8",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     },
     {
@@ -146,6 +234,7 @@ X-ROUTE: /v2/compute/network/interfaces
         "mac_address": "00:50:56:c0:00:09",
         "name": "vmnet9",
         "netmask": "255.255.255.0",
+        "special": true,
         "type": "ethernet"
     }
 ]
diff --git a/docs/api/examples/compute_get_projects.txt b/docs/api/examples/compute_get_projects.txt
index e2e41882..86299b60 100644
--- a/docs/api/examples/compute_get_projects.txt
+++ b/docs/api/examples/compute_get_projects.txt
@@ -5,19 +5,19 @@ GET /v2/compute/projects HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 198
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects
+Content-Length: 198
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:08 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects
 
 [
     {
         "name": "test",
-        "project_id": "51010203-0405-0607-0809-0a0b0c0d0e0f"
+        "project_id": "52010203-0405-0607-0809-0a0b0c0d0e0b"
     },
     {
         "name": "test",
-        "project_id": "52010203-0405-0607-0809-0a0b0c0d0e0b"
+        "project_id": "51010203-0405-0607-0809-0a0b0c0d0e0f"
     }
 ]
diff --git a/docs/api/examples/compute_get_projectsprojectid.txt b/docs/api/examples/compute_get_projectsprojectid.txt
index e7ab79bc..7acd74b2 100644
--- a/docs/api/examples/compute_get_projectsprojectid.txt
+++ b/docs/api/examples/compute_get_projectsprojectid.txt
@@ -5,11 +5,11 @@ GET /v2/compute/projects/40010203-0405-0607-0809-0a0b0c0d0e02 HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 80
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}
+Content-Length: 80
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:08 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}
 
 {
     "name": "test",
diff --git a/docs/api/examples/compute_get_projectsprojectidcloudnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidcloudnodesnodeid.txt
index 165114b7..a0525ef0 100644
--- a/docs/api/examples/compute_get_projectsprojectidcloudnodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidcloudnodesnodeid.txt
@@ -1,90 +1,166 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/34630f62-2144-4dd8-bf6f-a44a606b1a47'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/fba79b97-a89f-40f0-be86-7634ac44d703'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/34630f62-2144-4dd8-bf6f-a44a606b1a47 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/fba79b97-a89f-40f0-be86-7634ac44d703 HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1593
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
+Content-Length: 3420
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:03 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
 
 {
     "interfaces": [
         {
             "name": "bridge0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "en0",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "en1",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "en2",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "fw0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "lo0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "p2p0",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet0",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet1",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet2",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet3",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet4",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet5",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet6",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet7",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet1",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet10",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet2",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet3",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet4",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet5",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet6",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet7",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet8",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet9",
+            "special": true,
             "type": "ethernet"
         }
     ],
     "name": "Cloud 1",
-    "node_id": "34630f62-2144-4dd8-bf6f-a44a606b1a47",
-    "ports_mapping": [],
+    "node_id": "fba79b97-a89f-40f0-be86-7634ac44d703",
+    "ports_mapping": [
+        {
+            "interface": "en0",
+            "name": "en0",
+            "port_number": 0,
+            "type": "ethernet"
+        },
+        {
+            "interface": "en1",
+            "name": "en1",
+            "port_number": 1,
+            "type": "ethernet"
+        },
+        {
+            "interface": "en2",
+            "name": "en2",
+            "port_number": 2,
+            "type": "ethernet"
+        }
+    ],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "status": "started"
 }
diff --git a/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt
index cd2a69ef..cae04ffe 100644
--- a/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt
@@ -1,26 +1,26 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/058d18a2-92ca-4122-827b-26076d3cdd66'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/98822cd8-c665-4193-a301-677053402417'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/058d18a2-92ca-4122-827b-26076d3cdd66 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/98822cd8-c665-4193-a301-677053402417 HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 697
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
+Content-Length: 697
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:06 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
 
 {
     "command_line": "",
-    "console": 5711,
+    "console": 5713,
     "console_type": "telnet",
     "ethernet_adapters": 2,
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/iou/058d18a2-92ca-4122-827b-26076d3cdd66",
-    "node_id": "058d18a2-92ca-4122-827b-26076d3cdd66",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_json5/project-files/iou/98822cd8-c665-4193-a301-677053402417",
+    "node_id": "98822cd8-c665-4193-a301-677053402417",
     "nvram": 128,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_get_projectsprojectidnatnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidnatnodesnodeid.txt
index cf25a866..48dcc613 100644
--- a/docs/api/examples/compute_get_projectsprojectidnatnodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidnatnodesnodeid.txt
@@ -1,25 +1,25 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/8a6c287b-a7dd-456b-82e5-878fe3ddb13f'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/063c9b85-32ac-464b-9fc3-3428bc811583'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/8a6c287b-a7dd-456b-82e5-878fe3ddb13f HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/063c9b85-32ac-464b-9fc3-3428bc811583 HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 337
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
+Content-Length: 332
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:07 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
 
 {
     "name": "Nat 1",
-    "node_id": "8a6c287b-a7dd-456b-82e5-878fe3ddb13f",
+    "node_id": "063c9b85-32ac-464b-9fc3-3428bc811583",
     "ports_mapping": [
         {
-            "interface": "virbr0",
-            "name": "virbr0",
+            "interface": "gns3nat5",
+            "name": "nat0",
             "port_number": 0,
-            "type": "ethernet"
+            "type": "tap"
         }
     ],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
diff --git a/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt
index f157a2fb..ddf2fe34 100644
--- a/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt
@@ -1,15 +1,15 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8dbcde24-cf90-48bd-a0fb-de2e208d7573'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/42008117-5532-411a-b9f0-badc126dc605'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8dbcde24-cf90-48bd-a0fb-de2e208d7573 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/42008117-5532-411a-b9f0-badc126dc605 HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1415
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
+Content-Length: 1415
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:11 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
 
 {
     "acpi_shutdown": false,
@@ -19,7 +19,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
     "cdrom_image": "",
     "cdrom_image_md5sum": null,
     "command_line": "",
-    "console": 5711,
+    "console": 5713,
     "console_type": "telnet",
     "cpu_throttling": 0,
     "cpus": 1,
@@ -41,15 +41,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:dd:80:75:73:00",
+    "mac_address": "00:dd:80:c6:05:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/8dbcde24-cf90-48bd-a0fb-de2e208d7573",
-    "node_id": "8dbcde24-cf90-48bd-a0fb-de2e208d7573",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpo2joh79j/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/42008117-5532-411a-b9f0-badc126dc605",
+    "node_id": "42008117-5532-411a-b9f0-badc126dc605",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmccqyvwn/qemu-system-x86_64",
     "ram": 256,
     "status": "stopped",
     "usage": ""
diff --git a/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt
index 87bf2a0e..61033d45 100644
--- a/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt
@@ -1,27 +1,27 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bd5a4841-7543-4c38-bad8-d1477bb28f67'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a9820776-cd32-4112-b445-7a195a523733'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bd5a4841-7543-4c38-bad8-d1477bb28f67 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a9820776-cd32-4112-b445-7a195a523733 HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 471
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
+Content-Length: 471
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
 
 {
     "acpi_shutdown": false,
     "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
     "adapters": 0,
-    "console": 5712,
+    "console": 5714,
     "enable_remote_console": false,
     "headless": false,
     "linked_clone": false,
     "name": "VMTEST",
     "node_directory": null,
-    "node_id": "bd5a4841-7543-4c38-bad8-d1477bb28f67",
+    "node_id": "a9820776-cd32-4112-b445-7a195a523733",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "ram": 0,
     "status": "stopped",
diff --git a/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt
index 48fcd176..8f26767d 100644
--- a/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt
@@ -1,23 +1,23 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f3e04996-caaa-4b4f-9e6b-0a75464f32d5'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/a7fd9767-260b-444c-995e-a5d8a97652d6'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f3e04996-caaa-4b4f-9e6b-0a75464f32d5 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/a7fd9767-260b-444c-995e-a5d8a97652d6 HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 489
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
+Content-Length: 489
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:14 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
 
 {
     "command_line": "",
-    "console": 5720,
+    "console": 5722,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/f3e04996-caaa-4b4f-9e6b-0a75464f32d5",
-    "node_id": "f3e04996-caaa-4b4f-9e6b-0a75464f32d5",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpo2joh79j/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/a7fd9767-260b-444c-995e-a5d8a97652d6",
+    "node_id": "a7fd9767-260b-444c-995e-a5d8a97652d6",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": null,
     "startup_script_path": null,
diff --git a/docs/api/examples/compute_get_qemubinaries.txt b/docs/api/examples/compute_get_qemubinaries.txt
index 009a2cb3..53058650 100644
--- a/docs/api/examples/compute_get_qemubinaries.txt
+++ b/docs/api/examples/compute_get_qemubinaries.txt
@@ -9,11 +9,11 @@ GET /v2/compute/qemu/binaries HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 212
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/qemu/binaries
+Content-Length: 212
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:12 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/qemu/binaries
 
 [
     {
diff --git a/docs/api/examples/compute_get_qemucapabilities.txt b/docs/api/examples/compute_get_qemucapabilities.txt
index 7741ed76..2059addf 100644
--- a/docs/api/examples/compute_get_qemucapabilities.txt
+++ b/docs/api/examples/compute_get_qemucapabilities.txt
@@ -5,11 +5,11 @@ GET /v2/compute/qemu/capabilities HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 39
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/qemu/capabilities
+Content-Length: 39
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/qemu/capabilities
 
 {
     "kvm": [
diff --git a/docs/api/examples/compute_get_version.txt b/docs/api/examples/compute_get_version.txt
index 5c4dc735..8dc141aa 100644
--- a/docs/api/examples/compute_get_version.txt
+++ b/docs/api/examples/compute_get_version.txt
@@ -5,11 +5,11 @@ GET /v2/compute/version HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 49
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/version
+Content-Length: 49
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/version
 
 {
     "local": true,
diff --git a/docs/api/examples/compute_post_projects.txt b/docs/api/examples/compute_post_projects.txt
index 5008d644..e885a648 100644
--- a/docs/api/examples/compute_post_projects.txt
+++ b/docs/api/examples/compute_post_projects.txt
@@ -8,11 +8,11 @@ POST /v2/compute/projects HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 80
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects
+Content-Length: 80
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:08 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects
 
 {
     "name": "test",
diff --git a/docs/api/examples/compute_post_projectsprojectidclose.txt b/docs/api/examples/compute_post_projectsprojectidclose.txt
index c41bf64b..1f5ebea5 100644
--- a/docs/api/examples/compute_post_projectsprojectidclose.txt
+++ b/docs/api/examples/compute_post_projectsprojectidclose.txt
@@ -5,8 +5,9 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/close HTTP/1.1
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/close
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:09 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/close
 
diff --git a/docs/api/examples/compute_post_projectsprojectidcloudnodes.txt b/docs/api/examples/compute_post_projectsprojectidcloudnodes.txt
index eb99a4f0..9bcd422c 100644
--- a/docs/api/examples/compute_post_projectsprojectidcloudnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidcloudnodes.txt
@@ -7,86 +7,162 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes HTTP/
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 1593
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes
+Content-Length: 3420
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:03 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/cloud/nodes
 
 {
     "interfaces": [
         {
             "name": "bridge0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "en0",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "en1",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "en2",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "fw0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "lo0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "p2p0",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet0",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet1",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet2",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet3",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet4",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet5",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet6",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet7",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet1",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet10",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet2",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet3",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet4",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet5",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet6",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet7",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet8",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet9",
+            "special": true,
             "type": "ethernet"
         }
     ],
     "name": "Cloud 1",
-    "node_id": "6f4beb91-7921-4f1c-b9cd-ffeac5aa93f2",
-    "ports_mapping": [],
+    "node_id": "01a55236-2403-4215-bc5a-4b5e9232aaab",
+    "ports_mapping": [
+        {
+            "interface": "en0",
+            "name": "en0",
+            "port_number": 0,
+            "type": "ethernet"
+        },
+        {
+            "interface": "en1",
+            "name": "en1",
+            "port_number": 1,
+            "type": "ethernet"
+        },
+        {
+            "interface": "en2",
+            "name": "en2",
+            "port_number": 2,
+            "type": "ethernet"
+        }
+    ],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "status": "started"
 }
diff --git a/docs/api/examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index e3cf1924..3842f7cc 100644
--- a/docs/api/examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/2082261d-96d5-4ca7-9668-175ab9c3a328/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/7da4afa7-1def-4f3d-b01c-53f2b9d86e13/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/2082261d-96d5-4ca7-9668-175ab9c3a328/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/7da4afa7-1def-4f3d-b01c-53f2b9d86e13/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
@@ -10,11 +10,11 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/20822
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 89
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 89
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:03 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
 {
     "lport": 4242,
diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index b91daaec..4fc4c173 100644
--- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/72a5e8e7-52dc-4524-afe1-867723a01ad0/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/659d8f18-71b2-4f6a-9e15-99900156ac35/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/72a5e8e7-52dc-4524-afe1-867723a01ad0/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/659d8f18-71b2-4f6a-9e15-99900156ac35/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
@@ -10,11 +10,11 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/72a5
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 89
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 89
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:04 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
 {
     "lport": 4242,
diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
index 108d5830..bcf920c0 100644
--- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
+++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/06b94241-1c19-43ad-9fdb-ab34f8955968/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/65c5b5b9-7487-4504-bdcc-42e2f5178e73/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/06b94241-1c19-43ad-9fdb-ab34f8955968/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/65c5b5b9-7487-4504-bdcc-42e2f5178e73/adapters/0/ports/0/start_capture HTTP/1.1
 {
     "capture_file_name": "test.pcap",
     "data_link_type": "DLT_EN10MB"
@@ -8,12 +8,12 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/06b9
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 146
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
+Content-Length: 146
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:05 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
 
 {
-    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/tmp/captures/test.pcap"
+    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_json5/tmp/captures/test.pcap"
 }
diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
index d1e62b54..3bece362 100644
--- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
+++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/525765d2-3b72-4b91-98b3-312bece7b8ff/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2cf9d165-40be-4651-bc86-e780f0ba6e93/adapters/0/ports/0/stop_capture' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/525765d2-3b72-4b91-98b3-312bece7b8ff/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2cf9d165-40be-4651-bc86-e780f0ba6e93/adapters/0/ports/0/stop_capture HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:05 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture
 
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodes.txt b/docs/api/examples/compute_post_projectsprojectidiounodes.txt
index 155a18b3..9ead64fc 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodes.txt
@@ -1,31 +1,31 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes' -d '{"name": "PC TEST 1", "node_id": "67b7e870-fe42-4301-9862-7cd32811b424", "path": "iou.bin", "startup_config_content": "hostname test"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes' -d '{"name": "PC TEST 1", "node_id": "4eff93c6-3933-4bfc-9a84-7dd039341e9a", "path": "iou.bin", "startup_config_content": "hostname test"}'
 
 POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes HTTP/1.1
 {
     "name": "PC TEST 1",
-    "node_id": "67b7e870-fe42-4301-9862-7cd32811b424",
+    "node_id": "4eff93c6-3933-4bfc-9a84-7dd039341e9a",
     "path": "iou.bin",
     "startup_config_content": "hostname test"
 }
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 713
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes
+Content-Length: 713
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:05 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes
 
 {
     "command_line": "",
-    "console": 5711,
+    "console": 5713,
     "console_type": "telnet",
     "ethernet_adapters": 2,
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/iou/67b7e870-fe42-4301-9862-7cd32811b424",
-    "node_id": "67b7e870-fe42-4301-9862-7cd32811b424",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_json5/project-files/iou/4eff93c6-3933-4bfc-9a84-7dd039341e9a",
+    "node_id": "4eff93c6-3933-4bfc-9a84-7dd039341e9a",
     "nvram": 128,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 357f55b4..bea8c96c 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/222d17b2-661c-4fee-bb74-a224daa0eb21/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/8124305e-fbbd-4e7f-88ca-c877a93dcad5/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/222d17b2-661c-4fee-bb74-a224daa0eb21/adapters/1/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/8124305e-fbbd-4e7f-88ca-c877a93dcad5/adapters/1/ports/0/nio HTTP/1.1
 {
     "ethernet_device": "bridge0",
     "type": "nio_ethernet"
@@ -8,11 +8,11 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/222d17b
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 64
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 64
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:06 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
 {
     "ethernet_device": "bridge0",
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
index 6a351156..fb4cccd0 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/764dd16d-0415-4fb8-a824-9c127a0d3555/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7f566cd2-d08e-4f1c-aa87-675354f489ed/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/764dd16d-0415-4fb8-a824-9c127a0d3555/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7f566cd2-d08e-4f1c-aa87-675354f489ed/adapters/0/ports/0/start_capture HTTP/1.1
 {
     "capture_file_name": "test.pcap",
     "data_link_type": "DLT_EN10MB"
@@ -8,12 +8,12 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/764dd16
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 146
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
+Content-Length: 146
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:07 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
 
 {
-    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/tmp/captures/test.pcap"
+    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_json5/tmp/captures/test.pcap"
 }
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
index d72805be..30995f68 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4aa61165-026e-487c-a0ec-6aa054b656f3/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/93ca09d8-2e45-4a85-a4e3-0665dec3f16d/adapters/0/ports/0/stop_capture' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4aa61165-026e-487c-a0ec-6aa054b656f3/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/93ca09d8-2e45-4a85-a4e3-0665dec3f16d/adapters/0/ports/0/stop_capture HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:07 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture
 
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt
index 36327a42..16097a0d 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4b3e858d-c676-45e3-b359-70910b9aa900/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/854400c8-8ab2-4968-9493-7457f062a0b9/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4b3e858d-c676-45e3-b359-70910b9aa900/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/854400c8-8ab2-4968-9493-7457f062a0b9/reload HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/reload
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:06 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/reload
 
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt
index ab9d2b60..1336b954 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt
@@ -1,28 +1,28 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f04a8f46-d27f-4a47-81f5-23d490e2f113/start' -d '{"iourc_content": "test"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/45022335-0848-4370-b0a0-8a8a6d801f4d/start' -d '{"iourc_content": "test"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f04a8f46-d27f-4a47-81f5-23d490e2f113/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/45022335-0848-4370-b0a0-8a8a6d801f4d/start HTTP/1.1
 {
     "iourc_content": "test"
 }
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 697
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/start
+Content-Length: 697
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:06 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/start
 
 {
     "command_line": "",
-    "console": 5711,
+    "console": 5713,
     "console_type": "telnet",
     "ethernet_adapters": 2,
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/iou/f04a8f46-d27f-4a47-81f5-23d490e2f113",
-    "node_id": "f04a8f46-d27f-4a47-81f5-23d490e2f113",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_json5/project-files/iou/45022335-0848-4370-b0a0-8a8a6d801f4d",
+    "node_id": "45022335-0848-4370-b0a0-8a8a6d801f4d",
     "nvram": 128,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt
index fe25e7ab..f81cf2d1 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/c45c676f-28a2-472f-95f0-f9e48e24608c/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/840c81d5-88fd-4d59-ab89-cacb6d194ffb/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/c45c676f-28a2-472f-95f0-f9e48e24608c/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/840c81d5-88fd-4d59-ab89-cacb6d194ffb/stop HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/stop
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:06 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/stop
 
diff --git a/docs/api/examples/compute_post_projectsprojectidnatnodes.txt b/docs/api/examples/compute_post_projectsprojectidnatnodes.txt
index 32392712..a59cf052 100644
--- a/docs/api/examples/compute_post_projectsprojectidnatnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidnatnodes.txt
@@ -7,21 +7,21 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes HTTP/1.
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 337
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes
+Content-Length: 332
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:07 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/nat/nodes
 
 {
     "name": "Nat 1",
-    "node_id": "01896f4d-3570-4605-b689-b1a9cb3099f5",
+    "node_id": "3cdf49d9-e2a5-4359-aa72-b995b261ba97",
     "ports_mapping": [
         {
-            "interface": "virbr0",
-            "name": "virbr0",
+            "interface": "gns3nat4",
+            "name": "nat0",
             "port_number": 0,
-            "type": "ethernet"
+            "type": "tap"
         }
     ],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
diff --git a/docs/api/examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 4469a541..294ddc85 100644
--- a/docs/api/examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/64d8f00d-794a-4ceb-bcb7-473e95159332/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/60c8420d-7c38-4628-859d-85e406dfb436/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/64d8f00d-794a-4ceb-bcb7-473e95159332/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/60c8420d-7c38-4628-859d-85e406dfb436/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
@@ -10,11 +10,11 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/64d8f00
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 89
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 89
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:07 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
 {
     "lport": 4242,
diff --git a/docs/api/examples/compute_post_projectsprojectidportsudp.txt b/docs/api/examples/compute_post_projectsprojectidportsudp.txt
index 292031f4..9d5a52be 100644
--- a/docs/api/examples/compute_post_projectsprojectidportsudp.txt
+++ b/docs/api/examples/compute_post_projectsprojectidportsudp.txt
@@ -5,11 +5,11 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/ports/udp HTTP/1.
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 25
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/ports/udp
+Content-Length: 25
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:08 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/ports/udp
 
 {
     "udp_port": 10000
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodes.txt b/docs/api/examples/compute_post_projectsprojectidqemunodes.txt
index 15c80c1a..b54d354a 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodes.txt
@@ -1,20 +1,20 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/qemu-system-x86_64", "ram": 1024}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmccqyvwn/qemu-system-x86_64", "ram": 1024}'
 
 POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes HTTP/1.1
 {
     "hda_disk_image": "linux\u8f7d.img",
     "name": "PC TEST 1",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmccqyvwn/qemu-system-x86_64",
     "ram": 1024
 }
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 1461
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes
+Content-Length: 1461
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:10 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes
 
 {
     "acpi_shutdown": false,
@@ -24,7 +24,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes
     "cdrom_image": "",
     "cdrom_image_md5sum": null,
     "command_line": "",
-    "console": 5711,
+    "console": 5713,
     "console_type": "telnet",
     "cpu_throttling": 0,
     "cpus": 1,
@@ -46,15 +46,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:dd:80:7b:ae:00",
+    "mac_address": "00:dd:80:09:c6:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/d6932073-021c-4487-b7ae-598fdd5b7bae",
-    "node_id": "d6932073-021c-4487-b7ae-598fdd5b7bae",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpo2joh79j/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/bcf073b1-a5a1-4ce9-bc64-726267e509c6",
+    "node_id": "bcf073b1-a5a1-4ce9-bc64-726267e509c6",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmccqyvwn/qemu-system-x86_64",
     "ram": 1024,
     "status": "stopped",
     "usage": ""
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index e5aa30f7..c641e6f4 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/1dd8bd1c-9b93-460e-b89f-3edf32d4cfed/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/20362237-021f-45d1-84de-a2bf4c20a9d7/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/1dd8bd1c-9b93-460e-b89f-3edf32d4cfed/adapters/1/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/20362237-021f-45d1-84de-a2bf4c20a9d7/adapters/1/ports/0/nio HTTP/1.1
 {
     "ethernet_device": "eth0",
     "type": "nio_ethernet"
@@ -8,11 +8,11 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/1dd8bd
 
 
 HTTP/1.1 409
-CONTENT-LENGTH: 81
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 81
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:12 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
 {
     "message": "NIO of type nio_ethernet is not supported",
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt
index 62e997ec..8cc61e86 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/4d02fea0-afec-4674-9036-0a5b201ea147/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/1f47ef21-6d84-4b5b-8bd4-543cc2739f3b/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/4d02fea0-afec-4674-9036-0a5b201ea147/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/1f47ef21-6d84-4b5b-8bd4-543cc2739f3b/reload HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/reload
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:11 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/reload
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt
index c1144b7e..9545c267 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e8db19b-a05b-40dc-9b0b-5856ef87476c/resume' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8fa2adb1-1885-40c5-bed1-dcfccaab2520/resume' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e8db19b-a05b-40dc-9b0b-5856ef87476c/resume HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8fa2adb1-1885-40c5-bed1-dcfccaab2520/resume HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/resume
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:11 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/resume
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt
index a9cc86ae..4748fa50 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt
@@ -1,15 +1,15 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7f6708f3-7dfc-44cf-8fb9-60167d910d19/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/95f51a24-4db3-4fd4-89d0-25861018af48/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7f6708f3-7dfc-44cf-8fb9-60167d910d19/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/95f51a24-4db3-4fd4-89d0-25861018af48/start HTTP/1.1
 {}
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1415
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start
+Content-Length: 1415
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:11 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start
 
 {
     "acpi_shutdown": false,
@@ -19,7 +19,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start
     "cdrom_image": "",
     "cdrom_image_md5sum": null,
     "command_line": "",
-    "console": 5711,
+    "console": 5713,
     "console_type": "telnet",
     "cpu_throttling": 0,
     "cpus": 1,
@@ -41,15 +41,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:dd:80:0d:19:00",
+    "mac_address": "00:dd:80:af:48:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/7f6708f3-7dfc-44cf-8fb9-60167d910d19",
-    "node_id": "7f6708f3-7dfc-44cf-8fb9-60167d910d19",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpo2joh79j/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/95f51a24-4db3-4fd4-89d0-25861018af48",
+    "node_id": "95f51a24-4db3-4fd4-89d0-25861018af48",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmccqyvwn/qemu-system-x86_64",
     "ram": 256,
     "status": "stopped",
     "usage": ""
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt
index fabe0033..c64e58f1 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/35a8aa8f-8a84-4dde-b8b8-d19cef00b6b6/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e454bb5-4b20-4ee6-8363-932c95ad1244/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/35a8aa8f-8a84-4dde-b8b8-d19cef00b6b6/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e454bb5-4b20-4ee6-8363-932c95ad1244/stop HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/stop
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:11 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/stop
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt
index 9a5de598..f73db7ce 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2a5eca63-0705-4d1a-8d2e-f5479349e7c2/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b5a956a2-c5eb-47ca-8660-297f9db97eb9/suspend' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2a5eca63-0705-4d1a-8d2e-f5479349e7c2/suspend HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b5a956a2-c5eb-47ca-8660-297f9db97eb9/suspend HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/suspend
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:11 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/suspend
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
index 5bbf0d97..2532a11a 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
@@ -9,23 +9,23 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 465
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes
+Content-Length: 465
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes
 
 {
     "acpi_shutdown": false,
     "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
     "adapters": 0,
-    "console": 5711,
+    "console": 5713,
     "enable_remote_console": false,
     "headless": false,
     "linked_clone": false,
     "name": "VM1",
     "node_directory": null,
-    "node_id": "8dd097ca-91eb-4e28-9467-0ab62d2388aa",
+    "node_id": "139b95df-46bb-4ea8-90b0-93b7f72e7220",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "ram": 0,
     "status": "stopped",
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index d288749e..b03d94a2 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/3efce36b-25eb-40e4-8d55-f65220445f99/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/21e608e1-264b-42cc-919c-bee9d02f7d55/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/3efce36b-25eb-40e4-8d55-f65220445f99/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/21e608e1-264b-42cc-919c-bee9d02f7d55/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
@@ -10,11 +10,11 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 89
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 89
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:14 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
 {
     "lport": 4242,
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt
index e05834f6..66ec55f9 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/9f394bd7-f78d-4786-8ce2-cf09ce8aa0ad/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/dfa20c67-40f7-43cc-9f84-0dad2ba1a27c/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/9f394bd7-f78d-4786-8ce2-cf09ce8aa0ad/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/dfa20c67-40f7-43cc-9f84-0dad2ba1a27c/reload HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/reload
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/reload
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt
index bc44d69e..498a8352 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b30bdd7d-d7ce-472c-a5be-959b44f279f7/resume' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/43cb3d3d-4c83-4315-983c-f4c481822476/resume' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b30bdd7d-d7ce-472c-a5be-959b44f279f7/resume HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/43cb3d3d-4c83-4315-983c-f4c481822476/resume HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/resume
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/resume
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt
index 670ed4fe..7086525b 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/fcf6ad7a-0842-4ec0-b54b-37fe977896fd/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a7022726-0273-4f8b-8bb0-5c04fee78d3a/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/fcf6ad7a-0842-4ec0-b54b-37fe977896fd/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a7022726-0273-4f8b-8bb0-5c04fee78d3a/start HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/start
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/start
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt
index ea7d2e07..9c540485 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a35f2693-692b-4aa4-bd1b-6e3a5e7844e4/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a9675ed7-1f32-41a7-b231-bb923fbe4302/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a35f2693-692b-4aa4-bd1b-6e3a5e7844e4/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a9675ed7-1f32-41a7-b231-bb923fbe4302/stop HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/stop
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/stop
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt
index eb35fd20..4bcc1265 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/714c5575-f45b-4cd8-b7b6-940215e36973/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c39a0d07-64b2-44dd-9019-f5bf9eec7361/suspend' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/714c5575-f45b-4cd8-b7b6-940215e36973/suspend HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c39a0d07-64b2-44dd-9019-f5bf9eec7361/suspend HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/suspend
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}/suspend
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
index e1dfa62b..885a7826 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
@@ -7,19 +7,19 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes HTTP/1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 489
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes
+Content-Length: 489
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:14 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes
 
 {
     "command_line": "",
-    "console": 5720,
+    "console": 5722,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/28993ca5-cc72-4766-911e-6f88f9cb0dd2",
-    "node_id": "28993ca5-cc72-4766-911e-6f88f9cb0dd2",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpo2joh79j/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/e38e7a07-93f4-48fd-96f6-05663168870d",
+    "node_id": "e38e7a07-93f4-48fd-96f6-05663168870d",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": null,
     "startup_script_path": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 17a3ca9c..f7d5cbf9 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2e6458fb-9415-4d48-a2a5-fd67a04db517/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/d8deb983-a1b6-4c88-bb57-8a8c6d8a93d7/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2e6458fb-9415-4d48-a2a5-fd67a04db517/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/d8deb983-a1b6-4c88-bb57-8a8c6d8a93d7/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
@@ -10,11 +10,11 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2e6458
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 89
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+Content-Length: 89
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:14 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
 
 {
     "lport": 4242,
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt
index bc8f8f65..16629d01 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b8c8bedf-74e4-4dd5-8d43-d1d8bca1c0b9/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/726299c5-a366-4613-bdb6-c3b6ba9dc62f/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b8c8bedf-74e4-4dd5-8d43-d1d8bca1c0b9/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/726299c5-a366-4613-bdb6-c3b6ba9dc62f/reload HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/reload
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:15 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/reload
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt
index d171c591..49a034dc 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt
@@ -1,23 +1,23 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b32c3c1e-d6f2-4012-9430-6dc13c815f7a/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2b837084-9351-4f74-b5d7-6e00b81a75bd/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b32c3c1e-d6f2-4012-9430-6dc13c815f7a/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2b837084-9351-4f74-b5d7-6e00b81a75bd/start HTTP/1.1
 {}
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 489
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/start
+Content-Length: 489
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:15 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/start
 
 {
     "command_line": "",
-    "console": 5720,
+    "console": 5722,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/b32c3c1e-d6f2-4012-9430-6dc13c815f7a",
-    "node_id": "b32c3c1e-d6f2-4012-9430-6dc13c815f7a",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpo2joh79j/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/2b837084-9351-4f74-b5d7-6e00b81a75bd",
+    "node_id": "2b837084-9351-4f74-b5d7-6e00b81a75bd",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": null,
     "startup_script_path": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt
index 0bd21f55..3eeedb23 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/a7eff962-25e6-4f2d-a877-86c7fa144b1c/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/6a350a47-5117-4cf5-813c-6b4ab6ab5d15/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/a7eff962-25e6-4f2d-a877-86c7fa144b1c/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/6a350a47-5117-4cf5-813c-6b4ab6ab5d15/stop HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/stop
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:15 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/stop
 
diff --git a/docs/api/examples/compute_post_qemuimg.txt b/docs/api/examples/compute_post_qemuimg.txt
index e6fdd745..2149d17c 100644
--- a/docs/api/examples/compute_post_qemuimg.txt
+++ b/docs/api/examples/compute_post_qemuimg.txt
@@ -14,8 +14,9 @@ POST /v2/compute/qemu/img HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/qemu/img
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:13 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/qemu/img
 
diff --git a/docs/api/examples/compute_put_projectsprojectidcloudnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidcloudnodesnodeid.txt
index f9f86ff0..7dbdd3ac 100644
--- a/docs/api/examples/compute_put_projectsprojectidcloudnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidcloudnodesnodeid.txt
@@ -1,92 +1,168 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/e7b150e3-b03a-4a17-a28f-90e7a84e89d3' -d '{"name": "test"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/ad6018a3-6fe5-4e57-814b-09472ee68a82' -d '{"name": "test"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/e7b150e3-b03a-4a17-a28f-90e7a84e89d3 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/ad6018a3-6fe5-4e57-814b-09472ee68a82 HTTP/1.1
 {
     "name": "test"
 }
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1590
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
+Content-Length: 3417
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:04 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
 
 {
     "interfaces": [
         {
             "name": "bridge0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "en0",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "en1",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "en2",
+            "special": false,
             "type": "ethernet"
         },
         {
             "name": "fw0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "lo0",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "p2p0",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet0",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet1",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet2",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet3",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet4",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet5",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet6",
+            "special": true,
+            "type": "ethernet"
+        },
+        {
+            "name": "vboxnet7",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet1",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet10",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet2",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet3",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet4",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet5",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet6",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet7",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet8",
+            "special": true,
             "type": "ethernet"
         },
         {
             "name": "vmnet9",
+            "special": true,
             "type": "ethernet"
         }
     ],
     "name": "test",
-    "node_id": "e7b150e3-b03a-4a17-a28f-90e7a84e89d3",
-    "ports_mapping": [],
+    "node_id": "ad6018a3-6fe5-4e57-814b-09472ee68a82",
+    "ports_mapping": [
+        {
+            "interface": "en0",
+            "name": "en0",
+            "port_number": 0,
+            "type": "ethernet"
+        },
+        {
+            "interface": "en1",
+            "name": "en1",
+            "port_number": 1,
+            "type": "ethernet"
+        },
+        {
+            "interface": "en2",
+            "name": "en2",
+            "port_number": 2,
+            "type": "ethernet"
+        }
+    ],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "status": "started"
 }
diff --git a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
index 2143c034..709723bc 100644
--- a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
@@ -1,8 +1,8 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/b11cabf9-ffa8-470d-bc83-e9f047ba09e9' -d '{"console": 5713, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/57d77310-c390-42a9-abd5-5401f7f5a7d6' -d '{"console": 5715, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/b11cabf9-ffa8-470d-bc83-e9f047ba09e9 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/57d77310-c390-42a9-abd5-5401f7f5a7d6 HTTP/1.1
 {
-    "console": 5713,
+    "console": 5715,
     "environment": "GNS3=1\nGNS4=0",
     "name": "test",
     "start_command": "yes"
@@ -10,16 +10,16 @@ PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/b11ca
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 654
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}
+Content-Length: 654
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:05 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/docker/nodes/{node_id}
 
 {
     "adapters": 2,
-    "aux": 5712,
-    "console": 5713,
+    "aux": 5714,
+    "console": 5715,
     "console_http_path": "/",
     "console_http_port": 80,
     "console_resolution": "1280x1024",
@@ -28,8 +28,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}
     "environment": "GNS3=1\nGNS4=0",
     "image": "nginx:latest",
     "name": "test",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/docker/b11cabf9-ffa8-470d-bc83-e9f047ba09e9",
-    "node_id": "b11cabf9-ffa8-470d-bc83-e9f047ba09e9",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_json5/project-files/docker/57d77310-c390-42a9-abd5-5401f7f5a7d6",
+    "node_id": "57d77310-c390-42a9-abd5-5401f7f5a7d6",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "start_command": "yes",
     "status": "stopped"
diff --git a/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt
index a8ba3a58..e4cdfeb2 100644
--- a/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt
@@ -1,8 +1,8 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/79e87d08-c942-472c-baac-dbb34526882e' -d '{"console": 5712, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/65f7738a-38aa-46c4-8a49-51a5a7aaabcc' -d '{"console": 5714, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/79e87d08-c942-472c-baac-dbb34526882e HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/65f7738a-38aa-46c4-8a49-51a5a7aaabcc HTTP/1.1
 {
-    "console": 5712,
+    "console": 5714,
     "ethernet_adapters": 4,
     "iourc_content": "test",
     "l1_keepalives": true,
@@ -16,22 +16,22 @@ PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/79e87d08
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 708
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
+Content-Length: 708
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:06 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
 
 {
     "command_line": "",
-    "console": 5712,
+    "console": 5714,
     "console_type": "telnet",
     "ethernet_adapters": 4,
     "l1_keepalives": true,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "test",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/iou/79e87d08-c942-472c-baac-dbb34526882e",
-    "node_id": "79e87d08-c942-472c-baac-dbb34526882e",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_json5/project-files/iou/65f7738a-38aa-46c4-8a49-51a5a7aaabcc",
+    "node_id": "65f7738a-38aa-46c4-8a49-51a5a7aaabcc",
     "nvram": 2048,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_put_projectsprojectidnatnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidnatnodesnodeid.txt
index 8a4e7dec..fc1ddc3b 100644
--- a/docs/api/examples/compute_put_projectsprojectidnatnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidnatnodesnodeid.txt
@@ -1,27 +1,27 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/b945c3a0-b7f5-4bf3-8173-85f032b61b53' -d '{"name": "test"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/7402624f-431b-4d4e-935a-6deb548bd81b' -d '{"name": "test"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/b945c3a0-b7f5-4bf3-8173-85f032b61b53 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/7402624f-431b-4d4e-935a-6deb548bd81b HTTP/1.1
 {
     "name": "test"
 }
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 336
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
+Content-Length: 331
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:08 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
 
 {
     "name": "test",
-    "node_id": "b945c3a0-b7f5-4bf3-8173-85f032b61b53",
+    "node_id": "7402624f-431b-4d4e-935a-6deb548bd81b",
     "ports_mapping": [
         {
-            "interface": "virbr0",
-            "name": "virbr0",
+            "interface": "gns3nat9",
+            "name": "nat0",
             "port_number": 0,
-            "type": "ethernet"
+            "type": "tap"
         }
     ],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
diff --git a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
index 0aabd84a..e2b13457 100644
--- a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
@@ -1,8 +1,8 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/acb10e2a-f47c-4a95-8551-0e5f76fc206c' -d '{"console": 5712, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/18a04195-5602-47dd-9c1d-b6dee3b90e5e' -d '{"console": 5714, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/acb10e2a-f47c-4a95-8551-0e5f76fc206c HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/18a04195-5602-47dd-9c1d-b6dee3b90e5e HTTP/1.1
 {
-    "console": 5712,
+    "console": 5714,
     "hdb_disk_image": "linux\u8f7d.img",
     "name": "test",
     "ram": 1024
@@ -10,11 +10,11 @@ PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/acb10e2
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1456
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
+Content-Length: 1456
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:11 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
 
 {
     "acpi_shutdown": false,
@@ -24,7 +24,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
     "cdrom_image": "",
     "cdrom_image_md5sum": null,
     "command_line": "",
-    "console": 5712,
+    "console": 5714,
     "console_type": "telnet",
     "cpu_throttling": 0,
     "cpus": 1,
@@ -46,15 +46,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:dd:80:20:6c:00",
+    "mac_address": "00:dd:80:0e:5e:00",
     "name": "test",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/acb10e2a-f47c-4a95-8551-0e5f76fc206c",
-    "node_id": "acb10e2a-f47c-4a95-8551-0e5f76fc206c",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpo2joh79j/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/18a04195-5602-47dd-9c1d-b6dee3b90e5e",
+    "node_id": "18a04195-5602-47dd-9c1d-b6dee3b90e5e",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmccqyvwn/qemu-system-x86_64",
     "ram": 1024,
     "status": "stopped",
     "usage": ""
diff --git a/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
index db42e4e8..dacd8304 100644
--- a/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
@@ -1,30 +1,30 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bb7fb45b-8c96-4fdd-99fc-e1a91779d19a' -d '{"console": 5721, "name": "test"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/35e77f7c-5e4c-4e39-a025-aee0a65bc77d' -d '{"console": 5723, "name": "test"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bb7fb45b-8c96-4fdd-99fc-e1a91779d19a HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/35e77f7c-5e4c-4e39-a025-aee0a65bc77d HTTP/1.1
 {
-    "console": 5721,
+    "console": 5723,
     "name": "test"
 }
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 469
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
+Content-Length: 469
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:14 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
 
 {
     "acpi_shutdown": false,
     "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
     "adapters": 0,
-    "console": 5721,
+    "console": 5723,
     "enable_remote_console": false,
     "headless": false,
     "linked_clone": false,
     "name": "test",
     "node_directory": null,
-    "node_id": "bb7fb45b-8c96-4fdd-99fc-e1a91779d19a",
+    "node_id": "35e77f7c-5e4c-4e39-a025-aee0a65bc77d",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "ram": 0,
     "status": "stopped",
diff --git a/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
index d7576485..fb92d9ff 100644
--- a/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
@@ -1,27 +1,27 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/41035467-4785-45a3-997f-4125c0f0955c' -d '{"console": 5722, "name": "test", "startup_script": "ip 192.168.1.1"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/89b33b7f-9d21-4dce-b584-5afed089910d' -d '{"console": 5724, "name": "test", "startup_script": "ip 192.168.1.1"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/41035467-4785-45a3-997f-4125c0f0955c HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/89b33b7f-9d21-4dce-b584-5afed089910d HTTP/1.1
 {
-    "console": 5722,
+    "console": 5724,
     "name": "test",
     "startup_script": "ip 192.168.1.1"
 }
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 505
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
+Content-Length: 505
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:15 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
 
 {
     "command_line": "",
-    "console": 5722,
+    "console": 5724,
     "console_type": "telnet",
     "name": "test",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/41035467-4785-45a3-997f-4125c0f0955c",
-    "node_id": "41035467-4785-45a3-997f-4125c0f0955c",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpo2joh79j/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/89b33b7f-9d21-4dce-b584-5afed089910d",
+    "node_id": "89b33b7f-9d21-4dce-b584-5afed089910d",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": "ip 192.168.1.1",
     "startup_script_path": "startup.vpc",
diff --git a/docs/api/examples/controller_delete_projectsprojectid.txt b/docs/api/examples/controller_delete_projectsprojectid.txt
index a4aa1a9c..d7325b85 100644
--- a/docs/api/examples/controller_delete_projectsprojectid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/c8e7d20f-adab-47e4-be7f-6bd1b3028009'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/fbe3330d-b6ca-406d-a6c9-fe9703ee8763'
 
-DELETE /v2/projects/c8e7d20f-adab-47e4-be7f-6bd1b3028009 HTTP/1.1
+DELETE /v2/projects/fbe3330d-b6ca-406d-a6c9-fe9703ee8763 HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:22 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}
 
diff --git a/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt
index 3a0981e4..0f318c5d 100644
--- a/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/e4d9e39f-c6d7-4549-9a39-77b491a1d0c9/drawings/5e201fa7-093b-438a-813a-fb9c0ca7d1bc'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/9dc27fe7-73a9-4dbe-94ee-f87bd8d0470b/drawings/de040a53-4865-4894-a5ab-d49bd99520cd'
 
-DELETE /v2/projects/e4d9e39f-c6d7-4549-9a39-77b491a1d0c9/drawings/5e201fa7-093b-438a-813a-fb9c0ca7d1bc HTTP/1.1
+DELETE /v2/projects/9dc27fe7-73a9-4dbe-94ee-f87bd8d0470b/drawings/de040a53-4865-4894-a5ab-d49bd99520cd HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/drawings/{drawing_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:17 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/drawings/{drawing_id}
 
diff --git a/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt b/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt
index ac4b40f3..d718f3c6 100644
--- a/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/237d87b6-9912-4aff-9210-b46706b18caf/links/c1f96066-ff56-4c79-9a82-df5c53edcfd9'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/38865d4b-a234-4c29-a55e-62a39f27659e/links/a9cee8bd-b589-4228-a7dd-4e510885d74a'
 
-DELETE /v2/projects/237d87b6-9912-4aff-9210-b46706b18caf/links/c1f96066-ff56-4c79-9a82-df5c53edcfd9 HTTP/1.1
+DELETE /v2/projects/38865d4b-a234-4c29-a55e-62a39f27659e/links/a9cee8bd-b589-4228-a7dd-4e510885d74a HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/links/{link_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:19 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/links/{link_id}
 
diff --git a/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt
index 38bfd102..fb1a0627 100644
--- a/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/b33faa3d-e348-4de5-a266-30b3949d5872/nodes/cf34dae9-ff88-4ef4-a37f-e3954d07e351'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/a27cbb34-9e4e-458e-9404-a8956edab9e0/nodes/bc298eb5-15d6-480d-8a81-326841bec062'
 
-DELETE /v2/projects/b33faa3d-e348-4de5-a266-30b3949d5872/nodes/cf34dae9-ff88-4ef4-a37f-e3954d07e351 HTTP/1.1
+DELETE /v2/projects/a27cbb34-9e4e-458e-9404-a8956edab9e0/nodes/bc298eb5-15d6-480d-8a81-326841bec062 HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:21 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}
 
diff --git a/docs/api/examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt b/docs/api/examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt
index 0ec583d3..05477289 100644
--- a/docs/api/examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt
@@ -1,12 +1,13 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/444b02bb-7499-40a7-860c-531554e3e7ab/snapshots/e8b20eee-6a23-4dfc-8cae-1f3ec3e7b880'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/e101ad6d-fbf7-4c92-be30-2eb4524c9adb/snapshots/78c0d800-83c3-4c52-9dab-421cfc80abaa'
 
-DELETE /v2/projects/444b02bb-7499-40a7-860c-531554e3e7ab/snapshots/e8b20eee-6a23-4dfc-8cae-1f3ec3e7b880 HTTP/1.1
+DELETE /v2/projects/e101ad6d-fbf7-4c92-be30-2eb4524c9adb/snapshots/78c0d800-83c3-4c52-9dab-421cfc80abaa HTTP/1.1
 
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/snapshots/{snapshot_id}
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:24 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/snapshots/{snapshot_id}
 
diff --git a/docs/api/examples/controller_get_computes.txt b/docs/api/examples/controller_get_computes.txt
index 01ff33af..d21dc219 100644
--- a/docs/api/examples/controller_get_computes.txt
+++ b/docs/api/examples/controller_get_computes.txt
@@ -5,11 +5,11 @@ GET /v2/computes HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 387
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/computes
+Content-Length: 387
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:16 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/computes
 
 [
     {
diff --git a/docs/api/examples/controller_get_computescomputeid.txt b/docs/api/examples/controller_get_computescomputeid.txt
index b5375c79..077b4d87 100644
--- a/docs/api/examples/controller_get_computescomputeid.txt
+++ b/docs/api/examples/controller_get_computescomputeid.txt
@@ -5,11 +5,11 @@ GET /v2/computes/my_compute_id HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 334
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/computes/{compute_id}
+Content-Length: 334
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:16 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/computes/{compute_id}
 
 {
     "capabilities": {
diff --git a/docs/api/examples/controller_get_computescomputeidemulatorimages.txt b/docs/api/examples/controller_get_computescomputeidemulatorimages.txt
index f34adc11..8c7d27fb 100644
--- a/docs/api/examples/controller_get_computescomputeidemulatorimages.txt
+++ b/docs/api/examples/controller_get_computescomputeidemulatorimages.txt
@@ -5,11 +5,11 @@ GET /v2/computes/my_compute/qemu/images HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 95
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/computes/{compute_id}/{emulator}/images
+Content-Length: 95
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:16 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/computes/{compute_id}/{emulator}/images
 
 [
     {
diff --git a/docs/api/examples/controller_get_gns3vm.txt b/docs/api/examples/controller_get_gns3vm.txt
index 938ded7c..fd520943 100644
--- a/docs/api/examples/controller_get_gns3vm.txt
+++ b/docs/api/examples/controller_get_gns3vm.txt
@@ -5,16 +5,18 @@ GET /v2/gns3vm HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 115
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/gns3vm
+Content-Length: 148
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:17 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/gns3vm
 
 {
     "enable": false,
     "engine": "vmware",
     "headless": false,
+    "ram": 2048,
+    "vcpus": 1,
     "vmname": null,
     "when_exit": "stop"
 }
diff --git a/docs/api/examples/controller_get_gns3vmengines.txt b/docs/api/examples/controller_get_gns3vmengines.txt
index a297415e..91845bbe 100644
--- a/docs/api/examples/controller_get_gns3vmengines.txt
+++ b/docs/api/examples/controller_get_gns3vmengines.txt
@@ -5,11 +5,11 @@ GET /v2/gns3vm/engines HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1018
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/gns3vm/engines
+Content-Length: 1106
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:17 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/gns3vm/engines
 
 [
     {
@@ -17,6 +17,7 @@ X-ROUTE: /v2/gns3vm/engines
         "engine_id": "vmware",
         "name": "VMware Fusion",
         "support_headless": true,
+        "support_ram": true,
         "support_when_exit": true
     },
     {
@@ -24,6 +25,7 @@ X-ROUTE: /v2/gns3vm/engines
         "engine_id": "virtualbox",
         "name": "VirtualBox",
         "support_headless": true,
+        "support_ram": true,
         "support_when_exit": true
     },
     {
@@ -31,6 +33,7 @@ X-ROUTE: /v2/gns3vm/engines
         "engine_id": "remote",
         "name": "Remote",
         "support_headless": false,
+        "support_ram": false,
         "support_when_exit": false
     }
 ]
diff --git a/docs/api/examples/controller_get_gns3vmenginesenginevms.txt b/docs/api/examples/controller_get_gns3vmenginesenginevms.txt
index 6b29914a..76b97343 100644
--- a/docs/api/examples/controller_get_gns3vmenginesenginevms.txt
+++ b/docs/api/examples/controller_get_gns3vmenginesenginevms.txt
@@ -5,11 +5,11 @@ GET /v2/gns3vm/engines/vmware/vms HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 40
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/gns3vm/engines/{engine}/vms
+Content-Length: 40
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:17 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/gns3vm/engines/{engine}/vms
 
 [
     {
diff --git a/docs/api/examples/controller_get_projects.txt b/docs/api/examples/controller_get_projects.txt
index 007d305f..f5b52bdf 100644
--- a/docs/api/examples/controller_get_projects.txt
+++ b/docs/api/examples/controller_get_projects.txt
@@ -5,11 +5,11 @@ GET /v2/projects HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 370
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects
+Content-Length: 429
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:22 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects
 
 [
     {
@@ -18,8 +18,10 @@ X-ROUTE: /v2/projects
         "auto_start": false,
         "filename": "test.gns3",
         "name": "test",
-        "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_list_projects1",
+        "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_list_projects1",
         "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f",
+        "scene_height": 1000,
+        "scene_width": 2000,
         "status": "opened"
     }
 ]
diff --git a/docs/api/examples/controller_get_projectsprojectid.txt b/docs/api/examples/controller_get_projectsprojectid.txt
index 068053d2..2bacc197 100644
--- a/docs/api/examples/controller_get_projectsprojectid.txt
+++ b/docs/api/examples/controller_get_projectsprojectid.txt
@@ -1,15 +1,15 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/ad599422-7555-46f0-82aa-bc5cc232a84c'
+curl -i -X GET 'http://localhost:3080/v2/projects/b7f06506-7cdb-4fed-beca-f68e685c694c'
 
-GET /v2/projects/ad599422-7555-46f0-82aa-bc5cc232a84c HTTP/1.1
+GET /v2/projects/b7f06506-7cdb-4fed-beca-f68e685c694c HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 328
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}
+Content-Length: 379
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:22 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}
 
 {
     "auto_close": true,
@@ -17,7 +17,9 @@ X-ROUTE: /v2/projects/{project_id}
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm0i67nfc/projects/ad599422-7555-46f0-82aa-bc5cc232a84c",
-    "project_id": "ad599422-7555-46f0-82aa-bc5cc232a84c",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpszefva4f/projects/b7f06506-7cdb-4fed-beca-f68e685c694c",
+    "project_id": "b7f06506-7cdb-4fed-beca-f68e685c694c",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_get_projectsprojectiddrawings.txt b/docs/api/examples/controller_get_projectsprojectiddrawings.txt
index 396b451b..6ee87c70 100644
--- a/docs/api/examples/controller_get_projectsprojectiddrawings.txt
+++ b/docs/api/examples/controller_get_projectsprojectiddrawings.txt
@@ -1,20 +1,20 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/213aea2d-98f7-4d6b-a436-5f67458ad62d/drawings'
+curl -i -X GET 'http://localhost:3080/v2/projects/93b786be-fd9d-4fbf-b9a1-c53ebd52e3b1/drawings'
 
-GET /v2/projects/213aea2d-98f7-4d6b-a436-5f67458ad62d/drawings HTTP/1.1
+GET /v2/projects/93b786be-fd9d-4fbf-b9a1-c53ebd52e3b1/drawings HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 363
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/drawings
+Content-Length: 363
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:17 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/drawings
 
 [
     {
-        "drawing_id": "397ff7c4-157e-4513-bf16-5cf857fd2433",
-        "project_id": "213aea2d-98f7-4d6b-a436-5f67458ad62d",
+        "drawing_id": "b2654fa7-f511-4dcb-986e-491ec84b42d8",
+        "project_id": "93b786be-fd9d-4fbf-b9a1-c53ebd52e3b1",
         "rotation": 0,
         "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
         "x": 10,
diff --git a/docs/api/examples/controller_get_projectsprojectidlinks.txt b/docs/api/examples/controller_get_projectsprojectidlinks.txt
index 66fd6bd4..23bc57c2 100644
--- a/docs/api/examples/controller_get_projectsprojectidlinks.txt
+++ b/docs/api/examples/controller_get_projectsprojectidlinks.txt
@@ -1,22 +1,23 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/7577e59a-7758-4c5a-841f-be976afd8a57/links'
+curl -i -X GET 'http://localhost:3080/v2/projects/2295ee85-fc8b-4fa2-878c-914ff651c4a8/links'
 
-GET /v2/projects/7577e59a-7758-4c5a-841f-be976afd8a57/links HTTP/1.1
+GET /v2/projects/2295ee85-fc8b-4fa2-878c-914ff651c4a8/links HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1078
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/links
+Content-Length: 1111
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:18 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/links
 
 [
     {
         "capture_file_name": null,
         "capture_file_path": null,
         "capturing": false,
-        "link_id": "a5017183-450b-43ef-9f5b-7d9ef2f77670",
+        "link_id": "ca268d39-d533-4182-87da-16ef58fbf230",
+        "link_type": "ethernet",
         "nodes": [
             {
                 "adapter_number": 0,
@@ -27,7 +28,7 @@ X-ROUTE: /v2/projects/{project_id}/links
                     "x": -10,
                     "y": -10
                 },
-                "node_id": "7ec55228-4f17-47ec-9afa-041114f5a95e",
+                "node_id": "c824d9de-a001-47e4-bbce-9fee0533c10c",
                 "port_number": 3
             },
             {
@@ -39,10 +40,10 @@ X-ROUTE: /v2/projects/{project_id}/links
                     "x": -10,
                     "y": -10
                 },
-                "node_id": "ea49b826-f3ac-4683-898d-7c9384cd44f1",
+                "node_id": "1a1944d6-405f-44cc-9c97-40c753b213f2",
                 "port_number": 4
             }
         ],
-        "project_id": "7577e59a-7758-4c5a-841f-be976afd8a57"
+        "project_id": "2295ee85-fc8b-4fa2-878c-914ff651c4a8"
     }
 ]
diff --git a/docs/api/examples/controller_get_projectsprojectidnodes.txt b/docs/api/examples/controller_get_projectsprojectidnodes.txt
index 27f3bee6..92dd14ff 100644
--- a/docs/api/examples/controller_get_projectsprojectidnodes.txt
+++ b/docs/api/examples/controller_get_projectsprojectidnodes.txt
@@ -1,15 +1,15 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/f7d44669-cb36-4ec0-bcee-57ef25dbb640/nodes'
+curl -i -X GET 'http://localhost:3080/v2/projects/c55181df-bfe9-4556-9f56-d07b471c7c29/nodes'
 
-GET /v2/projects/f7d44669-cb36-4ec0-bcee-57ef25dbb640/nodes HTTP/1.1
+GET /v2/projects/c55181df-bfe9-4556-9f56-d07b471c7c29/nodes HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1264
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes
+Content-Length: 1264
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:19 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes
 
 [
     {
@@ -29,7 +29,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes
         },
         "name": "test",
         "node_directory": null,
-        "node_id": "cb86c0c4-5892-4178-a0ff-fda36032d578",
+        "node_id": "c09fb918-12f6-4b7f-a821-12f893bd236a",
         "node_type": "vpcs",
         "port_name_format": "Ethernet{0}",
         "port_segment_size": 0,
@@ -45,7 +45,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes
                 "short_name": "e0/0"
             }
         ],
-        "project_id": "f7d44669-cb36-4ec0-bcee-57ef25dbb640",
+        "project_id": "c55181df-bfe9-4556-9f56-d07b471c7c29",
         "properties": {
             "startup_script": "echo test"
         },
diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeid.txt
new file mode 100644
index 00000000..2544981c
--- /dev/null
+++ b/docs/api/examples/controller_get_projectsprojectidnodesnodeid.txt
@@ -0,0 +1,57 @@
+curl -i -X GET 'http://localhost:3080/v2/projects/a9ed36e5-580d-4a3e-8624-986dabbe4541/nodes/3b02a817-722a-4908-85c1-1f02eeb01739'
+
+GET /v2/projects/a9ed36e5-580d-4a3e-8624-986dabbe4541/nodes/3b02a817-722a-4908-85c1-1f02eeb01739 HTTP/1.1
+
+
+
+HTTP/1.1 200
+Content-Length: 1084
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}
+
+{
+    "command_line": null,
+    "compute_id": "example.com",
+    "console": 2048,
+    "console_host": "example.org",
+    "console_type": null,
+    "first_port_name": null,
+    "height": 59,
+    "label": {
+        "rotation": 0,
+        "style": "font-size: 10;font-familly: Verdana",
+        "text": "test",
+        "x": null,
+        "y": -40
+    },
+    "name": "test",
+    "node_directory": null,
+    "node_id": "3b02a817-722a-4908-85c1-1f02eeb01739",
+    "node_type": "vpcs",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "a9ed36e5-580d-4a3e-8624-986dabbe4541",
+    "properties": {
+        "startup_script": "echo test"
+    },
+    "status": "stopped",
+    "symbol": ":/symbols/computer.svg",
+    "width": 65,
+    "x": 0,
+    "y": 0,
+    "z": 0
+}
diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt
index 75584551..09210025 100644
--- a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt
+++ b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt
@@ -1,15 +1,15 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/4dc27f12-ba3b-44a3-af9e-2965ac360d8b/nodes/8b807f66-d4b6-438a-987a-b7dd3c3eff7a/dynamips/auto_idlepc'
+curl -i -X GET 'http://localhost:3080/v2/projects/068949e7-9a81-4efd-a5d7-d0ee52a0b16e/nodes/8b12f20d-0a89-4d31-8028-555a6bebf8b0/dynamips/auto_idlepc'
 
-GET /v2/projects/4dc27f12-ba3b-44a3-af9e-2965ac360d8b/nodes/8b807f66-d4b6-438a-987a-b7dd3c3eff7a/dynamips/auto_idlepc HTTP/1.1
+GET /v2/projects/068949e7-9a81-4efd-a5d7-d0ee52a0b16e/nodes/8b12f20d-0a89-4d31-8028-555a6bebf8b0/dynamips/auto_idlepc HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 30
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/dynamips/auto_idlepc
+Content-Length: 30
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:21 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}/dynamips/auto_idlepc
 
 {
     "idlepc": "0x60606f54"
diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt
index eb94278b..b90ce561 100644
--- a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt
+++ b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt
@@ -1,15 +1,15 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/67874f29-b0c6-43bd-b884-089848010c10/nodes/7933f17b-6a9e-47c4-97ac-4e952e658dfa/dynamips/idlepc_proposals'
+curl -i -X GET 'http://localhost:3080/v2/projects/04da7de1-40c9-4a5f-af3a-043f3891db97/nodes/84dd267d-b4ed-4db8-ab80-3b256cc2ca98/dynamips/idlepc_proposals'
 
-GET /v2/projects/67874f29-b0c6-43bd-b884-089848010c10/nodes/7933f17b-6a9e-47c4-97ac-4e952e658dfa/dynamips/idlepc_proposals HTTP/1.1
+GET /v2/projects/04da7de1-40c9-4a5f-af3a-043f3891db97/nodes/84dd267d-b4ed-4db8-ab80-3b256cc2ca98/dynamips/idlepc_proposals HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 38
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/dynamips/idlepc_proposals
+Content-Length: 38
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:21 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}/dynamips/idlepc_proposals
 
 [
     "0x60606f54",
diff --git a/docs/api/examples/controller_get_projectsprojectidsnapshots.txt b/docs/api/examples/controller_get_projectsprojectidsnapshots.txt
index be506b92..7bb79a86 100644
--- a/docs/api/examples/controller_get_projectsprojectidsnapshots.txt
+++ b/docs/api/examples/controller_get_projectsprojectidsnapshots.txt
@@ -1,21 +1,21 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/a73b08ff-47f8-4ce8-9eb2-f59d5def53d0/snapshots'
+curl -i -X GET 'http://localhost:3080/v2/projects/e6ebdced-ee5e-4af0-8d1e-8a377fb9ee41/snapshots'
 
-GET /v2/projects/a73b08ff-47f8-4ce8-9eb2-f59d5def53d0/snapshots HTTP/1.1
+GET /v2/projects/e6ebdced-ee5e-4af0-8d1e-8a377fb9ee41/snapshots HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 197
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/snapshots
+Content-Length: 197
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:24 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/snapshots
 
 [
     {
-        "created_at": 1473859409,
+        "created_at": 1474970484,
         "name": "test",
-        "project_id": "a73b08ff-47f8-4ce8-9eb2-f59d5def53d0",
-        "snapshot_id": "5696b200-d0df-4c89-9813-ba76f58917ae"
+        "project_id": "e6ebdced-ee5e-4af0-8d1e-8a377fb9ee41",
+        "snapshot_id": "472104bf-b65c-4d6d-b288-5bf3981826e5"
     }
 ]
diff --git a/docs/api/examples/controller_get_settings.txt b/docs/api/examples/controller_get_settings.txt
index 5192c094..e546620c 100644
--- a/docs/api/examples/controller_get_settings.txt
+++ b/docs/api/examples/controller_get_settings.txt
@@ -5,11 +5,11 @@ GET /v2/settings HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 20
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/settings
+Content-Length: 20
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:24 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/settings
 
 {
     "test": true
diff --git a/docs/api/examples/controller_get_symbols.txt b/docs/api/examples/controller_get_symbols.txt
index 838b8576..ec71012c 100644
--- a/docs/api/examples/controller_get_symbols.txt
+++ b/docs/api/examples/controller_get_symbols.txt
@@ -5,11 +5,11 @@ GET /v2/symbols HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 5174
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/symbols
+Content-Length: 5174
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:24 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/symbols
 
 [
     {
diff --git a/docs/api/examples/controller_get_version.txt b/docs/api/examples/controller_get_version.txt
index 498b537c..d7e081ab 100644
--- a/docs/api/examples/controller_get_version.txt
+++ b/docs/api/examples/controller_get_version.txt
@@ -5,11 +5,11 @@ GET /v2/version HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 49
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/version
+Content-Length: 49
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:25 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/version
 
 {
     "local": true,
diff --git a/docs/api/examples/controller_post_computes.txt b/docs/api/examples/controller_post_computes.txt
index 4fd4ef02..f9b10fc1 100644
--- a/docs/api/examples/controller_post_computes.txt
+++ b/docs/api/examples/controller_post_computes.txt
@@ -12,11 +12,11 @@ POST /v2/computes HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 334
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/computes
+Content-Length: 334
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:15 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/computes
 
 {
     "capabilities": {
diff --git a/docs/api/examples/controller_post_projects.txt b/docs/api/examples/controller_post_projects.txt
index 13871786..8a405c0c 100644
--- a/docs/api/examples/controller_post_projects.txt
+++ b/docs/api/examples/controller_post_projects.txt
@@ -8,11 +8,11 @@ POST /v2/projects HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 328
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects
+Content-Length: 379
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:21 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects
 
 {
     "auto_close": true,
@@ -20,7 +20,9 @@ X-ROUTE: /v2/projects
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpa6mgwv0u/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpihahq8x6/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
     "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsload.txt b/docs/api/examples/controller_post_projectsload.txt
index 16a76c20..a6c64f16 100644
--- a/docs/api/examples/controller_post_projectsload.txt
+++ b/docs/api/examples/controller_post_projectsload.txt
@@ -7,11 +7,11 @@ POST /v2/projects/load HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 328
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/load
+Content-Length: 379
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:23 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/load
 
 {
     "auto_close": true,
@@ -19,7 +19,9 @@ X-ROUTE: /v2/projects/load
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9hlt1889/projects/6f7c9f59-9706-452a-9ca9-ab6833b8128d",
-    "project_id": "6f7c9f59-9706-452a-9ca9-ab6833b8128d",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpfxgyjchh/projects/b0ac2ebd-60d7-4bf7-b624-01026c5f3a5b",
+    "project_id": "b0ac2ebd-60d7-4bf7-b624-01026c5f3a5b",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidclose.txt b/docs/api/examples/controller_post_projectsprojectidclose.txt
index e7913a02..b519b224 100644
--- a/docs/api/examples/controller_post_projectsprojectidclose.txt
+++ b/docs/api/examples/controller_post_projectsprojectidclose.txt
@@ -1,15 +1,15 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/37f11940-60d6-4a49-824b-0c8fd8444e74/close' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/c48b0488-3b89-4b97-abb1-1e55d6f4a130/close' -d '{}'
 
-POST /v2/projects/37f11940-60d6-4a49-824b-0c8fd8444e74/close HTTP/1.1
+POST /v2/projects/c48b0488-3b89-4b97-abb1-1e55d6f4a130/close HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 328
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/close
+Content-Length: 379
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:22 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/close
 
 {
     "auto_close": true,
@@ -17,7 +17,9 @@ X-ROUTE: /v2/projects/{project_id}/close
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1d654z13/projects/37f11940-60d6-4a49-824b-0c8fd8444e74",
-    "project_id": "37f11940-60d6-4a49-824b-0c8fd8444e74",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpi2k_x5ev/projects/c48b0488-3b89-4b97-abb1-1e55d6f4a130",
+    "project_id": "c48b0488-3b89-4b97-abb1-1e55d6f4a130",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectiddrawings.txt b/docs/api/examples/controller_post_projectsprojectiddrawings.txt
index 64fdeed3..cf67c5e0 100644
--- a/docs/api/examples/controller_post_projectsprojectiddrawings.txt
+++ b/docs/api/examples/controller_post_projectsprojectiddrawings.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/4e21c010-3db6-4f22-bb37-81dce4e5d7fd/drawings' -d '{"svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>", "x": 10, "y": 20, "z": 0}'
+curl -i -X POST 'http://localhost:3080/v2/projects/f52f1e26-848d-4d38-aed9-d4d6fadd8409/drawings' -d '{"svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>", "x": 10, "y": 20, "z": 0}'
 
-POST /v2/projects/4e21c010-3db6-4f22-bb37-81dce4e5d7fd/drawings HTTP/1.1
+POST /v2/projects/f52f1e26-848d-4d38-aed9-d4d6fadd8409/drawings HTTP/1.1
 {
     "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
     "x": 10,
@@ -10,15 +10,15 @@ POST /v2/projects/4e21c010-3db6-4f22-bb37-81dce4e5d7fd/drawings HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 323
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/drawings
+Content-Length: 323
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:16 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/drawings
 
 {
-    "drawing_id": "9c979443-867c-4169-98a2-50a55528d254",
-    "project_id": "4e21c010-3db6-4f22-bb37-81dce4e5d7fd",
+    "drawing_id": "97324da2-fa1d-4b03-89ed-96c300f70c02",
+    "project_id": "f52f1e26-848d-4d38-aed9-d4d6fadd8409",
     "rotation": 0,
     "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
     "x": 10,
diff --git a/docs/api/examples/controller_post_projectsprojectidduplicate.txt b/docs/api/examples/controller_post_projectsprojectidduplicate.txt
index 644a1239..d7c89fa1 100644
--- a/docs/api/examples/controller_post_projectsprojectidduplicate.txt
+++ b/docs/api/examples/controller_post_projectsprojectidduplicate.txt
@@ -1,17 +1,17 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/0f9ef2ca-ac08-475a-b41e-0e5fe21f75ea/duplicate' -d '{"name": "hello"}'
+curl -i -X POST 'http://localhost:3080/v2/projects/39b19482-f3b7-4ac9-83a1-a754f553f505/duplicate' -d '{"name": "hello"}'
 
-POST /v2/projects/0f9ef2ca-ac08-475a-b41e-0e5fe21f75ea/duplicate HTTP/1.1
+POST /v2/projects/39b19482-f3b7-4ac9-83a1-a754f553f505/duplicate HTTP/1.1
 {
     "name": "hello"
 }
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 299
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/duplicate
+Content-Length: 350
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:23 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/duplicate
 
 {
     "auto_close": true,
@@ -19,7 +19,9 @@ X-ROUTE: /v2/projects/{project_id}/duplicate
     "auto_start": false,
     "filename": "hello.gns3",
     "name": "hello",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpy0j7sw_o/projects/hello",
-    "project_id": "e47d8cbb-496e-429c-b3c6-be70ded013f1",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp412nbayy/projects/hello",
+    "project_id": "42a58062-f997-4be3-bd4a-14731d215cf9",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "closed"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidlinks.txt b/docs/api/examples/controller_post_projectsprojectidlinks.txt
index 4887380c..29c38934 100644
--- a/docs/api/examples/controller_post_projectsprojectidlinks.txt
+++ b/docs/api/examples/controller_post_projectsprojectidlinks.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/ad130b0e-f215-4e9a-8139-4976617ef8b2/links' -d '{"nodes": [{"adapter_number": 0, "label": {"text": "Text", "x": 42, "y": 0}, "node_id": "2d755c11-aa1f-412d-b5e3-6cbaee998928", "port_number": 3}, {"adapter_number": 2, "node_id": "8c7e73c0-918e-4442-9cb8-41f5d847a92b", "port_number": 4}]}'
+curl -i -X POST 'http://localhost:3080/v2/projects/c9112400-8166-4eac-99dd-069ce94ed0f9/links' -d '{"nodes": [{"adapter_number": 0, "label": {"text": "Text", "x": 42, "y": 0}, "node_id": "dacc5bd7-7738-483a-a644-cc7dc69705b3", "port_number": 3}, {"adapter_number": 2, "node_id": "b910eb40-b1b1-4b38-ab8f-61f096d54bb3", "port_number": 4}]}'
 
-POST /v2/projects/ad130b0e-f215-4e9a-8139-4976617ef8b2/links HTTP/1.1
+POST /v2/projects/c9112400-8166-4eac-99dd-069ce94ed0f9/links HTTP/1.1
 {
     "nodes": [
         {
@@ -10,12 +10,12 @@ POST /v2/projects/ad130b0e-f215-4e9a-8139-4976617ef8b2/links HTTP/1.1
                 "x": 42,
                 "y": 0
             },
-            "node_id": "2d755c11-aa1f-412d-b5e3-6cbaee998928",
+            "node_id": "dacc5bd7-7738-483a-a644-cc7dc69705b3",
             "port_number": 3
         },
         {
             "adapter_number": 2,
-            "node_id": "8c7e73c0-918e-4442-9cb8-41f5d847a92b",
+            "node_id": "b910eb40-b1b1-4b38-ab8f-61f096d54bb3",
             "port_number": 4
         }
     ]
@@ -23,17 +23,18 @@ POST /v2/projects/ad130b0e-f215-4e9a-8139-4976617ef8b2/links HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 846
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/links
+Content-Length: 875
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:17 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/links
 
 {
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "c3a00a39-4520-4663-8628-8bea7fdb5825",
+    "link_id": "76b7527f-96e7-4c0d-bcc7-98003f44634b",
+    "link_type": "ethernet",
     "nodes": [
         {
             "adapter_number": 0,
@@ -42,7 +43,7 @@ X-ROUTE: /v2/projects/{project_id}/links
                 "x": 42,
                 "y": 0
             },
-            "node_id": "2d755c11-aa1f-412d-b5e3-6cbaee998928",
+            "node_id": "dacc5bd7-7738-483a-a644-cc7dc69705b3",
             "port_number": 3
         },
         {
@@ -54,9 +55,9 @@ X-ROUTE: /v2/projects/{project_id}/links
                 "x": -10,
                 "y": -10
             },
-            "node_id": "8c7e73c0-918e-4442-9cb8-41f5d847a92b",
+            "node_id": "b910eb40-b1b1-4b38-ab8f-61f096d54bb3",
             "port_number": 4
         }
     ],
-    "project_id": "ad130b0e-f215-4e9a-8139-4976617ef8b2"
+    "project_id": "c9112400-8166-4eac-99dd-069ce94ed0f9"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt
index d1b2d2bd..ed6ab626 100644
--- a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt
+++ b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt
@@ -1,21 +1,22 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/20b23fbe-93ef-42cf-bfe9-9723803a3b55/links/52262649-be7c-4d42-823b-8cb3e8796220/start_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/5b0a6b9e-0602-4e0e-8fb2-5524408ebf0e/links/68777a6e-bcd4-469f-960d-9162a077c22a/start_capture' -d '{}'
 
-POST /v2/projects/20b23fbe-93ef-42cf-bfe9-9723803a3b55/links/52262649-be7c-4d42-823b-8cb3e8796220/start_capture HTTP/1.1
+POST /v2/projects/5b0a6b9e-0602-4e0e-8fb2-5524408ebf0e/links/68777a6e-bcd4-469f-960d-9162a077c22a/start_capture HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 218
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/links/{link_id}/start_capture
+Content-Length: 247
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:18 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/links/{link_id}/start_capture
 
 {
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "52262649-be7c-4d42-823b-8cb3e8796220",
+    "link_id": "68777a6e-bcd4-469f-960d-9162a077c22a",
+    "link_type": "ethernet",
     "nodes": [],
-    "project_id": "20b23fbe-93ef-42cf-bfe9-9723803a3b55"
+    "project_id": "5b0a6b9e-0602-4e0e-8fb2-5524408ebf0e"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt
index d9f6c775..fbce58de 100644
--- a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt
+++ b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt
@@ -1,21 +1,22 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/a01cdd0b-e4fa-46de-be52-eae27ce65e72/links/15212c71-b25d-4afd-bde1-9de061eb3b32/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/b5414507-053e-4629-b283-90b3ae076601/links/496bf3da-b79d-4e09-84df-e7ef129ae798/stop_capture' -d '{}'
 
-POST /v2/projects/a01cdd0b-e4fa-46de-be52-eae27ce65e72/links/15212c71-b25d-4afd-bde1-9de061eb3b32/stop_capture HTTP/1.1
+POST /v2/projects/b5414507-053e-4629-b283-90b3ae076601/links/496bf3da-b79d-4e09-84df-e7ef129ae798/stop_capture HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 218
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/links/{link_id}/stop_capture
+Content-Length: 247
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:18 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/links/{link_id}/stop_capture
 
 {
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "15212c71-b25d-4afd-bde1-9de061eb3b32",
+    "link_id": "496bf3da-b79d-4e09-84df-e7ef129ae798",
+    "link_type": "ethernet",
     "nodes": [],
-    "project_id": "a01cdd0b-e4fa-46de-be52-eae27ce65e72"
+    "project_id": "b5414507-053e-4629-b283-90b3ae076601"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidnodes.txt b/docs/api/examples/controller_post_projectsprojectidnodes.txt
index 65186ac9..54d586cb 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodes.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodes.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/64d2f5f1-04d0-49b4-962a-69240377ea49/nodes' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
+curl -i -X POST 'http://localhost:3080/v2/projects/fc3f06af-f655-4921-ae4e-a7561aa44523/nodes' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
 
-POST /v2/projects/64d2f5f1-04d0-49b4-962a-69240377ea49/nodes HTTP/1.1
+POST /v2/projects/fc3f06af-f655-4921-ae4e-a7561aa44523/nodes HTTP/1.1
 {
     "compute_id": "example.com",
     "name": "test",
@@ -12,11 +12,11 @@ POST /v2/projects/64d2f5f1-04d0-49b4-962a-69240377ea49/nodes HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 1084
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes
+Content-Length: 1084
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:19 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes
 
 {
     "command_line": null,
@@ -35,7 +35,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "9815a844-baaa-4887-b827-e4da9224585e",
+    "node_id": "d7c6907e-075c-4d6e-af9f-ef3780a6dd68",
     "node_type": "vpcs",
     "port_name_format": "Ethernet{0}",
     "port_segment_size": 0,
@@ -51,7 +51,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes
             "short_name": "e0/0"
         }
     ],
-    "project_id": "64d2f5f1-04d0-49b4-962a-69240377ea49",
+    "project_id": "fc3f06af-f655-4921-ae4e-a7561aa44523",
     "properties": {
         "startup_script": "echo test"
     },
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
index af6f971d..96165078 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
@@ -1,15 +1,15 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/ae1c517c-76aa-4234-8a25-e840987b6a72/nodes/d74d9e77-f6df-4e15-8ed6-e89eca04f305/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/e8152a0b-dfc9-4b92-b538-495ca9528ea0/nodes/2f4895cd-7050-4b35-85ca-87cb87ef9c45/reload' -d '{}'
 
-POST /v2/projects/ae1c517c-76aa-4234-8a25-e840987b6a72/nodes/d74d9e77-f6df-4e15-8ed6-e89eca04f305/reload HTTP/1.1
+POST /v2/projects/e8152a0b-dfc9-4b92-b538-495ca9528ea0/nodes/2f4895cd-7050-4b35-85ca-87cb87ef9c45/reload HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 1041
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/reload
+Content-Length: 1041
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:21 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}/reload
 
 {
     "command_line": null,
@@ -28,7 +28,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/reload
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "d74d9e77-f6df-4e15-8ed6-e89eca04f305",
+    "node_id": "2f4895cd-7050-4b35-85ca-87cb87ef9c45",
     "node_type": "vpcs",
     "port_name_format": "Ethernet{0}",
     "port_segment_size": 0,
@@ -44,7 +44,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/reload
             "short_name": "e0/0"
         }
     ],
-    "project_id": "ae1c517c-76aa-4234-8a25-e840987b6a72",
+    "project_id": "e8152a0b-dfc9-4b92-b538-495ca9528ea0",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
index eb585cbb..3a35852f 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
@@ -1,15 +1,15 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/b68fbf77-7840-4ca0-b79b-d5980bb058ce/nodes/625b8093-cc66-45f7-a2ae-e516902ced0a/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/8e606075-cb17-4066-b600-5e50520a08ce/nodes/c082e372-1502-43a4-9fc6-ff3509c2a922/start' -d '{}'
 
-POST /v2/projects/b68fbf77-7840-4ca0-b79b-d5980bb058ce/nodes/625b8093-cc66-45f7-a2ae-e516902ced0a/start HTTP/1.1
+POST /v2/projects/8e606075-cb17-4066-b600-5e50520a08ce/nodes/c082e372-1502-43a4-9fc6-ff3509c2a922/start HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 1041
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/start
+Content-Length: 1041
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}/start
 
 {
     "command_line": null,
@@ -28,7 +28,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/start
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "625b8093-cc66-45f7-a2ae-e516902ced0a",
+    "node_id": "c082e372-1502-43a4-9fc6-ff3509c2a922",
     "node_type": "vpcs",
     "port_name_format": "Ethernet{0}",
     "port_segment_size": 0,
@@ -44,7 +44,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/start
             "short_name": "e0/0"
         }
     ],
-    "project_id": "b68fbf77-7840-4ca0-b79b-d5980bb058ce",
+    "project_id": "8e606075-cb17-4066-b600-5e50520a08ce",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
index 25b42ea5..30eaca66 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
@@ -1,15 +1,15 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/34d0e133-95e7-47c9-87a0-f1838d99394d/nodes/08036f93-2e2a-4975-883a-15f2ff438bdc/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/52c42208-f712-4b2f-8f1c-3d39eaedc772/nodes/3828bb14-39da-45a0-a2dc-b9c94031e246/stop' -d '{}'
 
-POST /v2/projects/34d0e133-95e7-47c9-87a0-f1838d99394d/nodes/08036f93-2e2a-4975-883a-15f2ff438bdc/stop HTTP/1.1
+POST /v2/projects/52c42208-f712-4b2f-8f1c-3d39eaedc772/nodes/3828bb14-39da-45a0-a2dc-b9c94031e246/stop HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 1041
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/stop
+Content-Length: 1041
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}/stop
 
 {
     "command_line": null,
@@ -28,7 +28,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/stop
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "08036f93-2e2a-4975-883a-15f2ff438bdc",
+    "node_id": "3828bb14-39da-45a0-a2dc-b9c94031e246",
     "node_type": "vpcs",
     "port_name_format": "Ethernet{0}",
     "port_segment_size": 0,
@@ -44,7 +44,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/stop
             "short_name": "e0/0"
         }
     ],
-    "project_id": "34d0e133-95e7-47c9-87a0-f1838d99394d",
+    "project_id": "52c42208-f712-4b2f-8f1c-3d39eaedc772",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
index 1a879a0e..c88c47b6 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
@@ -1,15 +1,15 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/55df4f36-8ded-401d-b545-ea33f11da494/nodes/e9caad3a-a9f1-4bd6-ade3-9bb1486135e9/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/d5ae1014-e0c9-409e-9abf-fabd72830e41/nodes/f54982da-a58b-477c-b67b-02a74f215300/suspend' -d '{}'
 
-POST /v2/projects/55df4f36-8ded-401d-b545-ea33f11da494/nodes/e9caad3a-a9f1-4bd6-ade3-9bb1486135e9/suspend HTTP/1.1
+POST /v2/projects/d5ae1014-e0c9-409e-9abf-fabd72830e41/nodes/f54982da-a58b-477c-b67b-02a74f215300/suspend HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 1041
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/suspend
+Content-Length: 1041
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}/suspend
 
 {
     "command_line": null,
@@ -28,7 +28,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/suspend
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "e9caad3a-a9f1-4bd6-ade3-9bb1486135e9",
+    "node_id": "f54982da-a58b-477c-b67b-02a74f215300",
     "node_type": "vpcs",
     "port_name_format": "Ethernet{0}",
     "port_segment_size": 0,
@@ -44,7 +44,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/suspend
             "short_name": "e0/0"
         }
     ],
-    "project_id": "55df4f36-8ded-401d-b545-ea33f11da494",
+    "project_id": "d5ae1014-e0c9-409e-9abf-fabd72830e41",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesreload.txt
index f620deac..81d39d28 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesreload.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesreload.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/73512f66-9175-4c94-9da4-c5c0c0a43a97/nodes/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/3738eed6-4a9b-492b-ba74-ceac814d93f8/nodes/reload' -d '{}'
 
-POST /v2/projects/73512f66-9175-4c94-9da4-c5c0c0a43a97/nodes/reload HTTP/1.1
+POST /v2/projects/3738eed6-4a9b-492b-ba74-ceac814d93f8/nodes/reload HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/reload
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/reload
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesstart.txt
index f7825f9a..26d2419f 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesstart.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesstart.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/df731015-9498-46ad-a926-e12462692167/nodes/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/863f127c-e156-4416-bf4b-30cdcb90284b/nodes/start' -d '{}'
 
-POST /v2/projects/df731015-9498-46ad-a926-e12462692167/nodes/start HTTP/1.1
+POST /v2/projects/863f127c-e156-4416-bf4b-30cdcb90284b/nodes/start HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/start
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/start
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesstop.txt
index eaa6bd4d..22cf2ce7 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesstop.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesstop.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/c1eb365b-9696-40d1-9f24-14dfafeddcf8/nodes/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/6d799ff7-62ec-4a1a-b7a6-0536938080ec/nodes/stop' -d '{}'
 
-POST /v2/projects/c1eb365b-9696-40d1-9f24-14dfafeddcf8/nodes/stop HTTP/1.1
+POST /v2/projects/6d799ff7-62ec-4a1a-b7a6-0536938080ec/nodes/stop HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/stop
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/stop
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt
index 9b7712ef..3928cd55 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt
@@ -1,12 +1,13 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/946b2808-bd76-471a-a37a-e50682e60e4a/nodes/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/b8f3af17-060a-4d7a-a58f-16612d9313f2/nodes/suspend' -d '{}'
 
-POST /v2/projects/946b2808-bd76-471a-a37a-e50682e60e4a/nodes/suspend HTTP/1.1
+POST /v2/projects/b8f3af17-060a-4d7a-a58f-16612d9313f2/nodes/suspend HTTP/1.1
 {}
 
 
 HTTP/1.1 204
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/suspend
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/suspend
 
diff --git a/docs/api/examples/controller_post_projectsprojectidopen.txt b/docs/api/examples/controller_post_projectsprojectidopen.txt
index 210aeff0..451bd483 100644
--- a/docs/api/examples/controller_post_projectsprojectidopen.txt
+++ b/docs/api/examples/controller_post_projectsprojectidopen.txt
@@ -1,15 +1,15 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/ae11fd75-0b87-4db0-b781-0122c5caf92e/open' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/15453dce-f36e-4c87-92d0-6d5adc66ba81/open' -d '{}'
 
-POST /v2/projects/ae11fd75-0b87-4db0-b781-0122c5caf92e/open HTTP/1.1
+POST /v2/projects/15453dce-f36e-4c87-92d0-6d5adc66ba81/open HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 328
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/open
+Content-Length: 379
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:23 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/open
 
 {
     "auto_close": true,
@@ -17,7 +17,9 @@ X-ROUTE: /v2/projects/{project_id}/open
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp0sj55_d_/projects/ae11fd75-0b87-4db0-b781-0122c5caf92e",
-    "project_id": "ae11fd75-0b87-4db0-b781-0122c5caf92e",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9z1323np/projects/15453dce-f36e-4c87-92d0-6d5adc66ba81",
+    "project_id": "15453dce-f36e-4c87-92d0-6d5adc66ba81",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidsnapshots.txt b/docs/api/examples/controller_post_projectsprojectidsnapshots.txt
index 21184506..5c9bd0ad 100644
--- a/docs/api/examples/controller_post_projectsprojectidsnapshots.txt
+++ b/docs/api/examples/controller_post_projectsprojectidsnapshots.txt
@@ -1,21 +1,21 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/0b36822c-56a4-4957-8ed2-effdaf42fbb8/snapshots' -d '{"name": "snap1"}'
+curl -i -X POST 'http://localhost:3080/v2/projects/5485e521-146b-4be6-83e8-670f2573e63a/snapshots' -d '{"name": "snap1"}'
 
-POST /v2/projects/0b36822c-56a4-4957-8ed2-effdaf42fbb8/snapshots HTTP/1.1
+POST /v2/projects/5485e521-146b-4be6-83e8-670f2573e63a/snapshots HTTP/1.1
 {
     "name": "snap1"
 }
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 170
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/snapshots
+Content-Length: 170
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:24 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/snapshots
 
 {
-    "created_at": 1473859410,
+    "created_at": 1474970484,
     "name": "snap1",
-    "project_id": "0b36822c-56a4-4957-8ed2-effdaf42fbb8",
-    "snapshot_id": "411ff425-c0ad-4e0c-8411-8d43e4faa5aa"
+    "project_id": "5485e521-146b-4be6-83e8-670f2573e63a",
+    "snapshot_id": "1f94aef3-dc18-4b44-abc6-49f04da13aaa"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt b/docs/api/examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt
index 7483a2aa..d4268be8 100644
--- a/docs/api/examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt
+++ b/docs/api/examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt
@@ -1,15 +1,15 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0/snapshots/c3f5035d-bf37-4d1d-94c6-2ec676e90629/restore' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/4aa63ac6-3e11-40b5-9b28-6f59cf06294d/snapshots/2c4289f1-2239-4c5a-a84e-1536c71b320a/restore' -d '{}'
 
-POST /v2/projects/c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0/snapshots/c3f5035d-bf37-4d1d-94c6-2ec676e90629/restore HTTP/1.1
+POST /v2/projects/4aa63ac6-3e11-40b5-9b28-6f59cf06294d/snapshots/2c4289f1-2239-4c5a-a84e-1536c71b320a/restore HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 328
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/snapshots/{snapshot_id}/restore
+Content-Length: 379
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:24 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/snapshots/{snapshot_id}/restore
 
 {
     "auto_close": true,
@@ -17,7 +17,9 @@ X-ROUTE: /v2/projects/{project_id}/snapshots/{snapshot_id}/restore
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp8q441wzy/projects/c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0",
-    "project_id": "c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp5npj_q79/projects/4aa63ac6-3e11-40b5-9b28-6f59cf06294d",
+    "project_id": "4aa63ac6-3e11-40b5-9b28-6f59cf06294d",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_settings.txt b/docs/api/examples/controller_post_settings.txt
index 1405f96b..98fea85d 100644
--- a/docs/api/examples/controller_post_settings.txt
+++ b/docs/api/examples/controller_post_settings.txt
@@ -7,11 +7,11 @@ POST /v2/settings HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 20
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/settings
+Content-Length: 20
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:24 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/settings
 
 {
     "test": true
diff --git a/docs/api/examples/controller_post_shutdown.txt b/docs/api/examples/controller_post_shutdown.txt
index ea61dcbe..730c8809 100644
--- a/docs/api/examples/controller_post_shutdown.txt
+++ b/docs/api/examples/controller_post_shutdown.txt
@@ -5,8 +5,9 @@ POST /v2/shutdown HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 0
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/shutdown
+Content-Length: 0
+Content-Type: application/octet-stream
+Date: Tue, 27 Sep 2016 10:01:24 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/shutdown
 
diff --git a/docs/api/examples/controller_post_version.txt b/docs/api/examples/controller_post_version.txt
index 1cc277d7..b2fa8aff 100644
--- a/docs/api/examples/controller_post_version.txt
+++ b/docs/api/examples/controller_post_version.txt
@@ -7,11 +7,11 @@ POST /v2/version HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 30
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/version
+Content-Length: 30
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:25 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/version
 
 {
     "version": "2.0.0dev1"
diff --git a/docs/api/examples/controller_put_computescomputeid.txt b/docs/api/examples/controller_put_computescomputeid.txt
index 800f33f8..ddd558b5 100644
--- a/docs/api/examples/controller_put_computescomputeid.txt
+++ b/docs/api/examples/controller_put_computescomputeid.txt
@@ -12,11 +12,11 @@ PUT /v2/computes/my_compute_id HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 335
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/computes/{compute_id}
+Content-Length: 335
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:16 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/computes/{compute_id}
 
 {
     "capabilities": {
diff --git a/docs/api/examples/controller_put_gns3vm.txt b/docs/api/examples/controller_put_gns3vm.txt
index 031d37b9..57f98a90 100644
--- a/docs/api/examples/controller_put_gns3vm.txt
+++ b/docs/api/examples/controller_put_gns3vm.txt
@@ -7,11 +7,11 @@ PUT /v2/gns3vm HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 27
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/gns3vm
+Content-Length: 27
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:17 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/gns3vm
 
 {
     "vmname": "TEST VM"
diff --git a/docs/api/examples/controller_put_projectsprojectid.txt b/docs/api/examples/controller_put_projectsprojectid.txt
index 046824c7..8176a5ba 100644
--- a/docs/api/examples/controller_put_projectsprojectid.txt
+++ b/docs/api/examples/controller_put_projectsprojectid.txt
@@ -7,11 +7,11 @@ PUT /v2/projects/10010203-0405-0607-0809-0a0b0c0d0e0f HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 329
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}
+Content-Length: 380
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:22 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}
 
 {
     "auto_close": true,
@@ -19,7 +19,9 @@ X-ROUTE: /v2/projects/{project_id}
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test2",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvagfqk1t/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7gqkwxlc/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
     "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt
index 6e416520..4c0d95be 100644
--- a/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt
+++ b/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt
@@ -1,21 +1,21 @@
-curl -i -X PUT 'http://localhost:3080/v2/projects/709aacbf-aa1f-4b1b-a538-17f8294e98d1/drawings/28f0a4e0-fd69-4dda-b066-8fe5e2a43847' -d '{"x": 42}'
+curl -i -X PUT 'http://localhost:3080/v2/projects/f082d1bf-5b85-49a7-bce7-b6194f04f52e/drawings/e692ae9b-b88c-436c-a8de-3b3df798ba11' -d '{"x": 42}'
 
-PUT /v2/projects/709aacbf-aa1f-4b1b-a538-17f8294e98d1/drawings/28f0a4e0-fd69-4dda-b066-8fe5e2a43847 HTTP/1.1
+PUT /v2/projects/f082d1bf-5b85-49a7-bce7-b6194f04f52e/drawings/e692ae9b-b88c-436c-a8de-3b3df798ba11 HTTP/1.1
 {
     "x": 42
 }
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 323
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/drawings/{drawing_id}
+Content-Length: 323
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:17 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/drawings/{drawing_id}
 
 {
-    "drawing_id": "28f0a4e0-fd69-4dda-b066-8fe5e2a43847",
-    "project_id": "709aacbf-aa1f-4b1b-a538-17f8294e98d1",
+    "drawing_id": "e692ae9b-b88c-436c-a8de-3b3df798ba11",
+    "project_id": "f082d1bf-5b85-49a7-bce7-b6194f04f52e",
     "rotation": 0,
     "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
     "x": 42,
diff --git a/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt
index db2aee99..8f9a8717 100644
--- a/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt
+++ b/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:3080/v2/projects/46c9518a-9de2-43f7-91ed-55cb179fe562/nodes/fcc1c350-1079-4490-9597-f53bfed74dd1' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
+curl -i -X PUT 'http://localhost:3080/v2/projects/17b6a713-2586-459e-a84f-cf7a5368b367/nodes/38d965aa-7dc2-4287-9719-d6aa069660eb' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
 
-PUT /v2/projects/46c9518a-9de2-43f7-91ed-55cb179fe562/nodes/fcc1c350-1079-4490-9597-f53bfed74dd1 HTTP/1.1
+PUT /v2/projects/17b6a713-2586-459e-a84f-cf7a5368b367/nodes/38d965aa-7dc2-4287-9719-d6aa069660eb HTTP/1.1
 {
     "compute_id": "example.com",
     "name": "test",
@@ -12,11 +12,11 @@ PUT /v2/projects/46c9518a-9de2-43f7-91ed-55cb179fe562/nodes/fcc1c350-1079-4490-9
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 1041
-CONTENT-TYPE: application/json
-DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.5 GNS3/2.0.0dev1
-X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}
+Content-Length: 1041
+Content-Type: application/json
+Date: Tue, 27 Sep 2016 10:01:20 GMT
+Server: Python/3.5 GNS3/2.0.0dev1
+X-Route: /v2/projects/{project_id}/nodes/{node_id}
 
 {
     "command_line": null,
@@ -35,7 +35,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "fcc1c350-1079-4490-9597-f53bfed74dd1",
+    "node_id": "38d965aa-7dc2-4287-9719-d6aa069660eb",
     "node_type": "vpcs",
     "port_name_format": "Ethernet{0}",
     "port_segment_size": 0,
@@ -51,7 +51,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}
             "short_name": "e0/0"
         }
     ],
-    "project_id": "46c9518a-9de2-43f7-91ed-55cb179fe562",
+    "project_id": "17b6a713-2586-459e-a84f-cf7a5368b367",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/notifications/compute.updated.json b/docs/api/notifications/compute.updated.json
index 75d786f7..03589256 100644
--- a/docs/api/notifications/compute.updated.json
+++ b/docs/api/notifications/compute.updated.json
@@ -1,15 +1,26 @@
 {
     "capabilities": {
-        "node_types": [],
-        "version": null
+        "node_types": [
+            "cloud",
+            "ethernet_hub",
+            "ethernet_switch",
+            "vpcs",
+            "virtualbox",
+            "dynamips",
+            "frame_relay_switch",
+            "atm_switch",
+            "qemu",
+            "vmware"
+        ],
+        "version": "2.0.0dev1"
     },
-    "compute_id": "my_compute_id",
-    "connected": false,
-    "cpu_usage_percent": null,
-    "host": "localhost",
-    "memory_usage_percent": null,
-    "name": "http://julien@localhost:84",
-    "port": 84,
-    "protocol": "https",
-    "user": "julien"
+    "compute_id": "72c86a69-66eb-4d45-bb3f-c0d8def749ec",
+    "connected": true,
+    "cpu_usage_percent": 17.5,
+    "host": "127.0.0.1",
+    "memory_usage_percent": 76.5,
+    "name": "http://127.0.0.1:3080",
+    "port": 3080,
+    "protocol": "http",
+    "user": null
 }
\ No newline at end of file
diff --git a/docs/api/notifications/drawing.created.json b/docs/api/notifications/drawing.created.json
index 444ec648..4041ba55 100644
--- a/docs/api/notifications/drawing.created.json
+++ b/docs/api/notifications/drawing.created.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "397ff7c4-157e-4513-bf16-5cf857fd2433",
-    "project_id": "213aea2d-98f7-4d6b-a436-5f67458ad62d",
+    "drawing_id": "b2654fa7-f511-4dcb-986e-491ec84b42d8",
+    "project_id": "93b786be-fd9d-4fbf-b9a1-c53ebd52e3b1",
     "rotation": 0,
     "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
     "x": 10,
diff --git a/docs/api/notifications/drawing.deleted.json b/docs/api/notifications/drawing.deleted.json
index 2a9fd955..bff0fc87 100644
--- a/docs/api/notifications/drawing.deleted.json
+++ b/docs/api/notifications/drawing.deleted.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "5e201fa7-093b-438a-813a-fb9c0ca7d1bc",
-    "project_id": "e4d9e39f-c6d7-4549-9a39-77b491a1d0c9",
+    "drawing_id": "de040a53-4865-4894-a5ab-d49bd99520cd",
+    "project_id": "9dc27fe7-73a9-4dbe-94ee-f87bd8d0470b",
     "rotation": 0,
     "svg": "<svg></svg>",
     "x": 0,
diff --git a/docs/api/notifications/drawing.updated.json b/docs/api/notifications/drawing.updated.json
index 13f00d2d..5ab3a539 100644
--- a/docs/api/notifications/drawing.updated.json
+++ b/docs/api/notifications/drawing.updated.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "28f0a4e0-fd69-4dda-b066-8fe5e2a43847",
-    "project_id": "709aacbf-aa1f-4b1b-a538-17f8294e98d1",
+    "drawing_id": "e692ae9b-b88c-436c-a8de-3b3df798ba11",
+    "project_id": "f082d1bf-5b85-49a7-bce7-b6194f04f52e",
     "rotation": 0,
     "x": 42,
     "y": 20,
diff --git a/docs/api/notifications/link.created.json b/docs/api/notifications/link.created.json
index c435d146..f6d24b13 100644
--- a/docs/api/notifications/link.created.json
+++ b/docs/api/notifications/link.created.json
@@ -2,7 +2,8 @@
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "a5017183-450b-43ef-9f5b-7d9ef2f77670",
+    "link_id": "ca268d39-d533-4182-87da-16ef58fbf230",
+    "link_type": "ethernet",
     "nodes": [
         {
             "adapter_number": 0,
@@ -13,7 +14,7 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "7ec55228-4f17-47ec-9afa-041114f5a95e",
+            "node_id": "c824d9de-a001-47e4-bbce-9fee0533c10c",
             "port_number": 3
         },
         {
@@ -25,9 +26,9 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "ea49b826-f3ac-4683-898d-7c9384cd44f1",
+            "node_id": "1a1944d6-405f-44cc-9c97-40c753b213f2",
             "port_number": 4
         }
     ],
-    "project_id": "7577e59a-7758-4c5a-841f-be976afd8a57"
+    "project_id": "2295ee85-fc8b-4fa2-878c-914ff651c4a8"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/link.deleted.json b/docs/api/notifications/link.deleted.json
index da5de800..660b537a 100644
--- a/docs/api/notifications/link.deleted.json
+++ b/docs/api/notifications/link.deleted.json
@@ -2,7 +2,8 @@
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "c1f96066-ff56-4c79-9a82-df5c53edcfd9",
+    "link_id": "a9cee8bd-b589-4228-a7dd-4e510885d74a",
+    "link_type": "ethernet",
     "nodes": [],
-    "project_id": "237d87b6-9912-4aff-9210-b46706b18caf"
+    "project_id": "38865d4b-a234-4c29-a55e-62a39f27659e"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/link.updated.json b/docs/api/notifications/link.updated.json
index c215fa7f..c2dad799 100644
--- a/docs/api/notifications/link.updated.json
+++ b/docs/api/notifications/link.updated.json
@@ -2,7 +2,8 @@
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "53d6bd87-c993-48b5-929e-eb341e3e4ff0",
+    "link_id": "7e50ee4f-eb62-4a0d-9c61-4e3c8a0c5e4a",
+    "link_type": "ethernet",
     "nodes": [
         {
             "adapter_number": 0,
@@ -11,7 +12,7 @@
                 "x": 64,
                 "y": 0
             },
-            "node_id": "866a6df5-6a62-487e-a0da-1bd99c6190ff",
+            "node_id": "12111336-9763-45f1-adae-43ca7fc32c26",
             "port_number": 3
         },
         {
@@ -23,9 +24,9 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "37b4c123-e5a5-4aae-9be6-d746ef8b3958",
+            "node_id": "4a1e56d8-64bf-4686-a2a0-ffd67302f892",
             "port_number": 4
         }
     ],
-    "project_id": "2d1162b3-1094-4f73-9df0-c98d759fb88b"
+    "project_id": "d90e1de9-a63c-4ba0-b0b5-b5b1a20160b8"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/node.deleted.json b/docs/api/notifications/node.deleted.json
index e1f986f8..cd5205b7 100644
--- a/docs/api/notifications/node.deleted.json
+++ b/docs/api/notifications/node.deleted.json
@@ -15,7 +15,7 @@
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "cf34dae9-ff88-4ef4-a37f-e3954d07e351",
+    "node_id": "bc298eb5-15d6-480d-8a81-326841bec062",
     "node_type": "vpcs",
     "port_name_format": "Ethernet{0}",
     "port_segment_size": 0,
@@ -31,7 +31,7 @@
             "short_name": "e0/0"
         }
     ],
-    "project_id": "b33faa3d-e348-4de5-a266-30b3949d5872",
+    "project_id": "a27cbb34-9e4e-458e-9404-a8956edab9e0",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/notifications/node.updated.json b/docs/api/notifications/node.updated.json
index 9d5da4d9..1fc6f897 100644
--- a/docs/api/notifications/node.updated.json
+++ b/docs/api/notifications/node.updated.json
@@ -1,7 +1,7 @@
 {
     "command_line": "",
     "compute_id": "local",
-    "console": 5987,
+    "console": 5989,
     "console_host": "localhost",
     "console_type": "telnet",
     "first_port_name": null,
@@ -14,7 +14,7 @@
         "y": -25
     },
     "name": "PC1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_open0/project-files/vpcs/64ba8408-afbf-4b66-9cdd-1fd854427478",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-198/test_open0/project-files/vpcs/64ba8408-afbf-4b66-9cdd-1fd854427478",
     "node_id": "64ba8408-afbf-4b66-9cdd-1fd854427478",
     "node_type": "vpcs",
     "port_name_format": "Ethernet{0}",
diff --git a/docs/api/notifications/project.closed.json b/docs/api/notifications/project.closed.json
index 21960091..3e32e05b 100644
--- a/docs/api/notifications/project.closed.json
+++ b/docs/api/notifications/project.closed.json
@@ -4,7 +4,9 @@
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpy1hwdmxr/projects/1830ecc1-9a40-422d-9e15-ce407f7a1758",
-    "project_id": "1830ecc1-9a40-422d-9e15-ce407f7a1758",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwk4zxief/projects/a2547cb9-0934-417a-ae0a-666f1455bd86",
+    "project_id": "a2547cb9-0934-417a-ae0a-666f1455bd86",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "closed"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/project.updated.json b/docs/api/notifications/project.updated.json
index db15d711..c24748f2 100644
--- a/docs/api/notifications/project.updated.json
+++ b/docs/api/notifications/project.updated.json
@@ -4,7 +4,9 @@
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test2",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvagfqk1t/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7gqkwxlc/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
     "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "scene_height": 1000,
+    "scene_width": 2000,
     "status": "opened"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/snapshot.restored.json b/docs/api/notifications/snapshot.restored.json
index b548e559..e20f840d 100644
--- a/docs/api/notifications/snapshot.restored.json
+++ b/docs/api/notifications/snapshot.restored.json
@@ -1,6 +1,6 @@
 {
-    "created_at": 1473859410,
+    "created_at": 1474970484,
     "name": "test",
-    "project_id": "c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0",
-    "snapshot_id": "c3f5035d-bf37-4d1d-94c6-2ec676e90629"
+    "project_id": "4aa63ac6-3e11-40b5-9b28-6f59cf06294d",
+    "snapshot_id": "2c4289f1-2239-4c5a-a84e-1536c71b320a"
 }
\ No newline at end of file
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index e7ec2c53..e80939cb 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
index 740fc5be..7ba756c5 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -38,8 +38,8 @@ Update an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -81,8 +81,8 @@ Delete an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 7748a7f3..5f432e9d 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 174091fe..63c2746f 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
index 121048b4..8b113ea0 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an ATM switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
index 97de81c8..d51ff99a 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop an ATM switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
index d893d4d8..f3fb5f76 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend an ATM Relay switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
index d01d24ed..0fac182f 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
@@ -30,6 +30,7 @@ Interfaces on this host
     <table>
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Interface name</td>                     </tr>
+    <tr><td>special</td>                    <td>&#10004;</td>                     <td>boolean</td>                     <td>If true the interface is non standard (firewire for example)</td>                     </tr>
     <tr><td>type</td>                    <td>&#10004;</td>                     <td>enum</td>                     <td>Possible values: ethernet, tap</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
index 6d013e68..64758932 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -45,8 +45,8 @@ Update a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -68,6 +68,7 @@ Interfaces on this host
     <table>
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Interface name</td>                     </tr>
+    <tr><td>special</td>                    <td>&#10004;</td>                     <td>boolean</td>                     <td>If true the interface is non standard (firewire for example)</td>                     </tr>
     <tr><td>type</td>                    <td>&#10004;</td>                     <td>enum</td>                     <td>Possible values: ethernet, tap</td>                     </tr>
     </table>
 
@@ -112,8 +113,8 @@ Delete a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 9ceda591..511269d3 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the cloud (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the cloud (always 0)
 - **port_number**: Port on the cloud
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the cloud (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the cloud (always 0)
 - **port_number**: Port on the cloud
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 2c49263e..e3408e2f 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the cloud (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the cloud (always 0)
 - **port_number**: Port on the cloud
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 9cf4577a..d5c8831e 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the cloud (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the cloud (always 0)
 - **port_number**: Port on the cloud
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
index 7332ec76..64a379fa 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a cloud
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
index 6a1070a7..06a1d80d 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a cloud
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
index 28c5de49..01641dad 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a cloud
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
index 0828a3c9..6371c4df 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
@@ -9,8 +9,8 @@ Delete a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -25,8 +25,8 @@ Update a Docker instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index f8c38b36..dd09d777 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **adapter_number**: Adapter where the nio should be added
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **adapter_number**: Adapter where the nio should be added
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 56ae3a52..d36d981e 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a Docker container instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to start a packet capture
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 9b9afa51..caa8bb57 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a Docker container instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to stop a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
index 62ea8357..6e2b1547 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
@@ -9,8 +9,8 @@ Pause a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
index 12b5d9e1..f88df489 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
@@ -9,8 +9,8 @@ Restart a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
index 073462cb..cf4c5131 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
index 88ca6b9a..f1f688d4 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
index 327ed120..281800d0 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
@@ -9,8 +9,8 @@ Unpause a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodes.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodes.rst
index a1c30ef8..3857fce1 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodes.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodes.rst
@@ -49,7 +49,6 @@ Input
     <tr><td>platform</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Cisco router platform</td>                     </tr>
     <tr><td>power_supplies</td>                    <td> </td>                     <td>array</td>                     <td>Power supplies status</td>                     </tr>
     <tr><td>private_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS private configuration file</td>                     </tr>
-    <tr><td>private_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Private configuration base64 encoded</td>                     </tr>
     <tr><td>private_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS private configuration file</td>                     </tr>
     <tr><td>ram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Amount of RAM in MB</td>                     </tr>
     <tr><td>sensors</td>                    <td> </td>                     <td>array</td>                     <td>Temperature sensors</td>                     </tr>
@@ -62,7 +61,6 @@ Input
     <tr><td>slot6</td>                    <td> </td>                     <td></td>                     <td>Network module slot 6</td>                     </tr>
     <tr><td>sparsemem</td>                    <td> </td>                     <td>boolean</td>                     <td>Sparse memory feature</td>                     </tr>
     <tr><td>startup_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS startup configuration file</td>                     </tr>
-    <tr><td>startup_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Startup configuration base64 encoded</td>                     </tr>
     <tr><td>startup_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS startup configuration file</td>                     </tr>
     <tr><td>system_id</td>                    <td> </td>                     <td>string</td>                     <td>System ID</td>                     </tr>
     <tr><td>wic0</td>                    <td> </td>                     <td></td>                     <td>Network module WIC slot 0</td>                     </tr>
@@ -103,7 +101,7 @@ Output
     <tr><td>platform</td>                    <td> </td>                     <td>string</td>                     <td>Cisco router platform</td>                     </tr>
     <tr><td>power_supplies</td>                    <td> </td>                     <td>array</td>                     <td>Power supplies status</td>                     </tr>
     <tr><td>private_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS private configuration file</td>                     </tr>
-    <tr><td>private_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Private configuration base64 encoded</td>                     </tr>
+    <tr><td>private_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS private configuration file</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Amount of RAM in MB</td>                     </tr>
     <tr><td>sensors</td>                    <td> </td>                     <td>array</td>                     <td>Temperature sensors</td>                     </tr>
@@ -116,7 +114,7 @@ Output
     <tr><td>slot6</td>                    <td> </td>                     <td></td>                     <td>Network module slot 6</td>                     </tr>
     <tr><td>sparsemem</td>                    <td> </td>                     <td>boolean</td>                     <td>Sparse memory feature</td>                     </tr>
     <tr><td>startup_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS startup configuration file</td>                     </tr>
-    <tr><td>startup_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Startup configuration base64 encoded</td>                     </tr>
+    <tr><td>startup_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS startup configuration file</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     <tr><td>system_id</td>                    <td> </td>                     <td>string</td>                     <td>System ID</td>                     </tr>
     <tr><td>wic0</td>                    <td> </td>                     <td></td>                     <td>Network module WIC slot 0</td>                     </tr>
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
index c7f7a768..51b25087 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -51,7 +51,7 @@ Output
     <tr><td>platform</td>                    <td> </td>                     <td>string</td>                     <td>Cisco router platform</td>                     </tr>
     <tr><td>power_supplies</td>                    <td> </td>                     <td>array</td>                     <td>Power supplies status</td>                     </tr>
     <tr><td>private_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS private configuration file</td>                     </tr>
-    <tr><td>private_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Private configuration base64 encoded</td>                     </tr>
+    <tr><td>private_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS private configuration file</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Amount of RAM in MB</td>                     </tr>
     <tr><td>sensors</td>                    <td> </td>                     <td>array</td>                     <td>Temperature sensors</td>                     </tr>
@@ -64,7 +64,7 @@ Output
     <tr><td>slot6</td>                    <td> </td>                     <td></td>                     <td>Network module slot 6</td>                     </tr>
     <tr><td>sparsemem</td>                    <td> </td>                     <td>boolean</td>                     <td>Sparse memory feature</td>                     </tr>
     <tr><td>startup_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS startup configuration file</td>                     </tr>
-    <tr><td>startup_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Startup configuration base64 encoded</td>                     </tr>
+    <tr><td>startup_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS startup configuration file</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     <tr><td>system_id</td>                    <td> </td>                     <td>string</td>                     <td>System ID</td>                     </tr>
     <tr><td>wic0</td>                    <td> </td>                     <td></td>                     <td>Network module WIC slot 0</td>                     </tr>
@@ -79,8 +79,8 @@ Update a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -120,7 +120,6 @@ Input
     <tr><td>platform</td>                    <td> </td>                     <td>string</td>                     <td>Cisco router platform</td>                     </tr>
     <tr><td>power_supplies</td>                    <td> </td>                     <td>array</td>                     <td>Power supplies status</td>                     </tr>
     <tr><td>private_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS private configuration file.</td>                     </tr>
-    <tr><td>private_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Private configuration base64 encoded</td>                     </tr>
     <tr><td>private_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS private configuration file</td>                     </tr>
     <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Amount of RAM in MB</td>                     </tr>
     <tr><td>sensors</td>                    <td> </td>                     <td>array</td>                     <td>Temperature sensors</td>                     </tr>
@@ -133,7 +132,6 @@ Input
     <tr><td>slot6</td>                    <td> </td>                     <td></td>                     <td>Network module slot 6</td>                     </tr>
     <tr><td>sparsemem</td>                    <td> </td>                     <td>boolean</td>                     <td>Sparse memory feature</td>                     </tr>
     <tr><td>startup_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS startup configuration file.</td>                     </tr>
-    <tr><td>startup_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Startup configuration base64 encoded</td>                     </tr>
     <tr><td>startup_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS startup configuration file</td>                     </tr>
     <tr><td>system_id</td>                    <td> </td>                     <td>string</td>                     <td>System ID</td>                     </tr>
     <tr><td>wic0</td>                    <td> </td>                     <td></td>                     <td>Network module WIC slot 0</td>                     </tr>
@@ -174,7 +172,7 @@ Output
     <tr><td>platform</td>                    <td> </td>                     <td>string</td>                     <td>Cisco router platform</td>                     </tr>
     <tr><td>power_supplies</td>                    <td> </td>                     <td>array</td>                     <td>Power supplies status</td>                     </tr>
     <tr><td>private_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS private configuration file</td>                     </tr>
-    <tr><td>private_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Private configuration base64 encoded</td>                     </tr>
+    <tr><td>private_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS private configuration file</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Amount of RAM in MB</td>                     </tr>
     <tr><td>sensors</td>                    <td> </td>                     <td>array</td>                     <td>Temperature sensors</td>                     </tr>
@@ -187,7 +185,7 @@ Output
     <tr><td>slot6</td>                    <td> </td>                     <td></td>                     <td>Network module slot 6</td>                     </tr>
     <tr><td>sparsemem</td>                    <td> </td>                     <td>boolean</td>                     <td>Sparse memory feature</td>                     </tr>
     <tr><td>startup_config</td>                    <td> </td>                     <td>string</td>                     <td>Path to the IOS startup configuration file</td>                     </tr>
-    <tr><td>startup_config_base64</td>                    <td> </td>                     <td>string</td>                     <td>Startup configuration base64 encoded</td>                     </tr>
+    <tr><td>startup_config_content</td>                    <td> </td>                     <td>string</td>                     <td>Content of IOS startup configuration file</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     <tr><td>system_id</td>                    <td> </td>                     <td>string</td>                     <td>System ID</td>                     </tr>
     <tr><td>wic0</td>                    <td> </td>                     <td></td>                     <td>Network module WIC slot 0</td>                     </tr>
@@ -202,8 +200,8 @@ Delete a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 62fd35fa..e184e6af 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **adapter_number**: Adapter where the nio should be added
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter from where the nio should be removed
 - **project_id**: Project UUID
+- **adapter_number**: Adapter from where the nio should be removed
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 52f3778a..bc488f1e 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to start a packet capture
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 4cc11da9..30a88d5d 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to stop a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
index 81a775f4..8e8d4f54 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
@@ -9,8 +9,8 @@ Retrieve the idlepc proposals
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
index 53d61343..c5cde1de 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
@@ -9,8 +9,8 @@ Retrieve the idlepc proposals
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
index 9ae98a06..655f3522 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
index d45ede09..53f7ef21 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
@@ -9,8 +9,8 @@ Resume a suspended Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
index de898325..0729560f 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
index c9b01c50..e09a2d31 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
index 075f3df6..ffa73f96 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
index 0d582397..7b66227c 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -38,8 +38,8 @@ Update an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -97,8 +97,8 @@ Delete an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index ca7a6887..5bfada08 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the hub (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the hub (always 0)
 - **port_number**: Port on the hub
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the hub (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the hub (always 0)
 - **port_number**: Port on the hub
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 825f67ed..e60ea8f7 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the hub (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the hub (always 0)
 - **port_number**: Port on the hub
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 3b85a13e..66024308 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the hub (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the hub (always 0)
 - **port_number**: Port on the hub
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
index 275d9a62..04d7e9d2 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an Ethernet hub
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
index 7a98a5dc..5ea86cc0 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop an Ethernet hub
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
index 1ee67e63..f3b3158a 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend an Ethernet hub
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
index 23b6ac6d..c51766b8 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -38,8 +38,8 @@ Update an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -100,8 +100,8 @@ Delete an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 1e907c5a..53ae531e 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 376442a9..74e00e52 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index fca913f3..d8cd38c4 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
index a3d3d51d..a5b9c7a4 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an Ethernet switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
index a5b5e5ec..6ac3a291 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop an Ethernet switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
index 89755223..8751dcc5 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend an Ethernet switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
index 245dce77..018e6d1a 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -38,8 +38,8 @@ Update a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -81,8 +81,8 @@ Delete a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 813e2cae..5bbaafb6 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index cdc53e50..adee0094 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index e4ccc069..4e41e959 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the switch (always 0)
 - **port_number**: Port on the switch
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
index 89a7a3c9..0b1ae513 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Frame Relay switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
index 9d6e3273..e8f144f1 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a Frame Relay switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
index aae9bc87..13a417da 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a Frame Relay switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
index 0c3f693b..3f94ca76 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
@@ -9,8 +9,8 @@ Get an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -60,8 +60,8 @@ Update an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -141,8 +141,8 @@ Delete an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 5db59dbe..2db1c0b3 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **adapter_number**: Network adapter where the nio is located
 - **port_number**: Port where the nio should be added
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **adapter_number**: Network adapter where the nio is located
 - **port_number**: Port from where the nio should be removed
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 4c67fe9a..237d27da 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on an IOU VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to start a packet capture
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index b118d82e..e846741f 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on an IOU VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to stop a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
index 86ada843..fcf350cd 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
index 70eab247..3df8062a 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
index e1df8aa9..45c52663 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
index 07f4ebd8..28509197 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a nat instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -44,8 +44,8 @@ Update a nat instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -93,8 +93,8 @@ Delete a nat instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index a6baa3a8..0849e982 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a nat instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the nat (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the nat (always 0)
 - **port_number**: Port on the nat
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a nat instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the nat (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the nat (always 0)
 - **port_number**: Port on the nat
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index fa174f0b..f623a930 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a nat instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the nat (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the nat (always 0)
 - **port_number**: Port on the nat
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 59d27ac2..598f7d18 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a nat instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the nat (always 0)
 - **project_id**: Project UUID
+- **adapter_number**: Adapter on the nat (always 0)
 - **port_number**: Port on the nat
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstart.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstart.rst
index b35197f7..2da40ba2 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstart.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a nat
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstop.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstop.rst
index 837e5d6d..ea9d3b10 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstop.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a nat
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidsuspend.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidsuspend.rst
index cf78d8d8..600330b5 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a nat
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/project/projects.rst b/docs/api/v2/compute/project/projects.rst
index 2dac781a..3599488c 100644
--- a/docs/api/v2/compute/project/projects.rst
+++ b/docs/api/v2/compute/project/projects.rst
@@ -38,6 +38,8 @@ Input
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     </table>
 
 Output
@@ -53,6 +55,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/compute/project/projectsprojectid.rst b/docs/api/v2/compute/project/projectsprojectid.rst
index 560f7007..534c11a9 100644
--- a/docs/api/v2/compute/project/projectsprojectid.rst
+++ b/docs/api/v2/compute/project/projectsprojectid.rst
@@ -29,6 +29,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/compute/project/projectsprojectidimport.rst b/docs/api/v2/compute/project/projectsprojectidimport.rst
index 313aebbf..a8acc297 100644
--- a/docs/api/v2/compute/project/projectsprojectidimport.rst
+++ b/docs/api/v2/compute/project/projectsprojectidimport.rst
@@ -29,6 +29,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
index afa11ec4..4f357856 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -80,8 +80,8 @@ Update a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -197,8 +197,8 @@ Delete a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 069afaf8..33788090 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **adapter_number**: Network adapter where the nio is located
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **adapter_number**: Network adapter where the nio is located
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index dfdeb5c6..ff1844f4 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to start a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 5b032733..e3a27472 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to stop a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
index dff97a96..57a0c1c4 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
index b19656e5..ab5190f3 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
@@ -9,8 +9,8 @@ Resume a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
index 1cf2ac05..07abd6fa 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
index bcd612d6..e25400f6 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
index 306e3189..dd81c58d 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
index 1d78f182..33ff7a23 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -54,8 +54,8 @@ Update a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -123,8 +123,8 @@ Delete a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 400842a7..ef8d9279 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **adapter_number**: Adapter where the nio should be added
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter from where the nio should be removed
 - **project_id**: Project UUID
+- **adapter_number**: Adapter from where the nio should be removed
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 256db4a6..408fbb00 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to start a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 3af4cad0..7d5716e7 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to stop a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
index ba593e10..03b5c253 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
index 50e1bba3..c3c15852 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
@@ -9,8 +9,8 @@ Resume a suspended VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
index 62ead042..999f5bca 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
index 202424dc..5f116158 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
index e1dad875..212c6ebf 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
index 4fea23d3..b5fcf5d8 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -47,8 +47,8 @@ Update a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -108,8 +108,8 @@ Delete a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index ea1c3f0d..4d117f5a 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **adapter_number**: Adapter where the nio should be added
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter from where the nio should be removed
 - **project_id**: Project UUID
+- **adapter_number**: Adapter from where the nio should be removed
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 4662bcd0..1dfa0bee 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to start a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index bd72c0cb..e7004621 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to stop a packet capture
 - **port_number**: Port on the adapter (always 0)
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
index 16913e56..d3672687 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
@@ -9,8 +9,8 @@ Allocate a VMware VMnet interface on the server
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
index d63d89d9..33f5c50b 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
index 84d21d6c..ac7c95ef 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
@@ -9,8 +9,8 @@ Resume a suspended VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
index 3240f8da..d6c21dbf 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
index a260c0c8..a60da50d 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
index b2306c74..1c9a83cd 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
index 641002f8..a1b3a95d 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -49,8 +49,8 @@ Update a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -103,8 +103,8 @@ Delete a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 2a0c017a..0bac9b07 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **adapter_number**: Network adapter where the nio is located
 - **port_number**: Port where the nio should be added
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **adapter_number**: Network adapter where the nio is located
 - **port_number**: Port from where the nio should be removed
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 90d80187..f7633e0a 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to start a packet capture
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 5f9d7554..d755e954 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **adapter_number**: Adapter to stop a packet capture
 - **port_number**: Port on the adapter
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
index e3cc4ec9..1689078c 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
index 6f438a4f..d40a2398 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
index 280dbca1..779f0ad5 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst
index 430b8fab..fb7751a9 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a VPCS instance (stop it)
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst b/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst
index 956f0a76..749b099f 100644
--- a/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst
+++ b/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst
@@ -9,8 +9,8 @@ Create a new drawing instance
 
 Parameters
 **********
-- **drawing_id**: Drawing UUID
 - **project_id**: Project UUID
+- **drawing_id**: Drawing UUID
 
 Response status codes
 **********************
@@ -60,8 +60,8 @@ Delete a drawing instance
 
 Parameters
 **********
-- **drawing_id**: Drawing UUID
 - **project_id**: Project UUID
+- **drawing_id**: Drawing UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/link/projectsprojectidlinks.rst b/docs/api/v2/controller/link/projectsprojectidlinks.rst
index eb86a2de..f24e9b6d 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinks.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinks.rst
@@ -45,6 +45,7 @@ Input
     <tr><td>capture_file_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Read only property. The full path of the capture file if capture is running</td>                     </tr>
     <tr><td>capturing</td>                    <td> </td>                     <td>boolean</td>                     <td>Read only property. True if a capture running on the link</td>                     </tr>
     <tr><td>link_id</td>                    <td> </td>                     <td>string</td>                     <td>Link UUID</td>                     </tr>
+    <tr><td>link_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: ethernet, serial</td>                     </tr>
     <tr><td>nodes</td>                    <td>&#10004;</td>                     <td>array</td>                     <td>List of the VMS</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     </table>
@@ -59,6 +60,7 @@ Output
     <tr><td>capture_file_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Read only property. The full path of the capture file if capture is running</td>                     </tr>
     <tr><td>capturing</td>                    <td> </td>                     <td>boolean</td>                     <td>Read only property. True if a capture running on the link</td>                     </tr>
     <tr><td>link_id</td>                    <td> </td>                     <td>string</td>                     <td>Link UUID</td>                     </tr>
+    <tr><td>link_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: ethernet, serial</td>                     </tr>
     <tr><td>nodes</td>                    <td>&#10004;</td>                     <td>array</td>                     <td>List of the VMS</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     </table>
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
index 0d62948b..defb182f 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
@@ -27,6 +27,7 @@ Input
     <tr><td>capture_file_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Read only property. The full path of the capture file if capture is running</td>                     </tr>
     <tr><td>capturing</td>                    <td> </td>                     <td>boolean</td>                     <td>Read only property. True if a capture running on the link</td>                     </tr>
     <tr><td>link_id</td>                    <td> </td>                     <td>string</td>                     <td>Link UUID</td>                     </tr>
+    <tr><td>link_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: ethernet, serial</td>                     </tr>
     <tr><td>nodes</td>                    <td>&#10004;</td>                     <td>array</td>                     <td>List of the VMS</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     </table>
@@ -41,6 +42,7 @@ Output
     <tr><td>capture_file_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Read only property. The full path of the capture file if capture is running</td>                     </tr>
     <tr><td>capturing</td>                    <td> </td>                     <td>boolean</td>                     <td>Read only property. True if a capture running on the link</td>                     </tr>
     <tr><td>link_id</td>                    <td> </td>                     <td>string</td>                     <td>Link UUID</td>                     </tr>
+    <tr><td>link_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: ethernet, serial</td>                     </tr>
     <tr><td>nodes</td>                    <td>&#10004;</td>                     <td>array</td>                     <td>List of the VMS</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     </table>
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
index 9e57489f..0cb8c1e7 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
@@ -37,6 +37,7 @@ Output
     <tr><td>capture_file_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Read only property. The full path of the capture file if capture is running</td>                     </tr>
     <tr><td>capturing</td>                    <td> </td>                     <td>boolean</td>                     <td>Read only property. True if a capture running on the link</td>                     </tr>
     <tr><td>link_id</td>                    <td> </td>                     <td>string</td>                     <td>Link UUID</td>                     </tr>
+    <tr><td>link_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: ethernet, serial</td>                     </tr>
     <tr><td>nodes</td>                    <td>&#10004;</td>                     <td>array</td>                     <td>List of the VMS</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     </table>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
index 3660ec9b..ce72ee19 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
@@ -3,6 +3,54 @@
 
 .. contents::
 
+GET /v2/projects/**{project_id}**/nodes/**{node_id}**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Update a node instance
+
+Response status codes
+**********************
+- **200**: Node found
+- **400**: Invalid request
+- **404**: Node doesn't exist
+
+Output
+*******
+.. raw:: html
+
+    <table>
+    <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
+    <tr><td>command_line</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Command line use to start the node</td>                     </tr>
+    <tr><td>compute_id</td>                    <td> </td>                     <td>string</td>                     <td>Compute identifier</td>                     </tr>
+    <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
+    <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
+    <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
+    <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
+    <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
+    <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
+    <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
+    <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
+    <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
+    <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
+    <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
+    <tr><td>symbol</td>                    <td> </td>                     <td>string</td>                     <td>Symbol of the node</td>                     </tr>
+    <tr><td>width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the node (Read only)</td>                     </tr>
+    <tr><td>x</td>                    <td> </td>                     <td>integer</td>                     <td>X position of the node</td>                     </tr>
+    <tr><td>y</td>                    <td> </td>                     <td>integer</td>                     <td>Y position of the node</td>                     </tr>
+    <tr><td>z</td>                    <td> </td>                     <td>integer</td>                     <td>Z position of the node</td>                     </tr>
+    </table>
+
+Sample session
+***************
+
+
+.. literalinclude:: ../../../examples/controller_get_projectsprojectidnodesnodeid.txt
+
+
 PUT /v2/projects/**{project_id}**/nodes/**{node_id}**
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Update a node instance
@@ -88,8 +136,8 @@ Delete a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
index cc04c2e5..3b74b947 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
@@ -9,8 +9,8 @@ Compute the IDLE PC for a Dynamips node
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
index e5e05092..3ee287e4 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
@@ -9,8 +9,8 @@ Compute a list of potential idle PC for a node
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidfilespath.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidfilespath.rst
index 54e26c0c..249f6341 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidfilespath.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidfilespath.rst
@@ -9,8 +9,8 @@ Get a file in the node directory
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -25,8 +25,8 @@ Write a file in the node directory
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
index 19fcdbd1..60f6d56f 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
index 426278bf..df0b0a49 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
index 5fc60640..e28389c5 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
index dff34191..2440d4ad 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/project/projects.rst b/docs/api/v2/controller/project/projects.rst
index 38dbcaf1..de09074c 100644
--- a/docs/api/v2/controller/project/projects.rst
+++ b/docs/api/v2/controller/project/projects.rst
@@ -22,6 +22,8 @@ Input
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     </table>
 
 Output
@@ -37,6 +39,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/controller/project/projectsload.rst b/docs/api/v2/controller/project/projectsload.rst
index f27ca234..e59bc766 100644
--- a/docs/api/v2/controller/project/projectsload.rst
+++ b/docs/api/v2/controller/project/projectsload.rst
@@ -38,6 +38,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/controller/project/projectsprojectid.rst b/docs/api/v2/controller/project/projectsprojectid.rst
index 616f4b2f..074bf368 100644
--- a/docs/api/v2/controller/project/projectsprojectid.rst
+++ b/docs/api/v2/controller/project/projectsprojectid.rst
@@ -44,6 +44,8 @@ Input
     <tr><td>auto_start</td>                    <td> </td>                     <td>boolean</td>                     <td>Project start when opened</td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the project on the server (work only with --local)</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     </table>
 
 Output
@@ -59,6 +61,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/controller/project/projectsprojectidclose.rst b/docs/api/v2/controller/project/projectsprojectidclose.rst
index 27fe562b..49ec81a6 100644
--- a/docs/api/v2/controller/project/projectsprojectidclose.rst
+++ b/docs/api/v2/controller/project/projectsprojectidclose.rst
@@ -29,6 +29,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/controller/project/projectsprojectidduplicate.rst b/docs/api/v2/controller/project/projectsprojectidduplicate.rst
index a4e67f89..39c607a9 100644
--- a/docs/api/v2/controller/project/projectsprojectidduplicate.rst
+++ b/docs/api/v2/controller/project/projectsprojectidduplicate.rst
@@ -27,6 +27,8 @@ Input
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     </table>
 
 Output
@@ -42,6 +44,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/controller/project/projectsprojectidimport.rst b/docs/api/v2/controller/project/projectsprojectidimport.rst
index 8e5d1713..a259e4cd 100644
--- a/docs/api/v2/controller/project/projectsprojectidimport.rst
+++ b/docs/api/v2/controller/project/projectsprojectidimport.rst
@@ -29,6 +29,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/controller/project/projectsprojectidopen.rst b/docs/api/v2/controller/project/projectsprojectidopen.rst
index 718f24a1..02c3e627 100644
--- a/docs/api/v2/controller/project/projectsprojectidopen.rst
+++ b/docs/api/v2/controller/project/projectsprojectidopen.rst
@@ -29,6 +29,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst b/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst
index 2d5319da..f949f4a8 100644
--- a/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst
+++ b/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst
@@ -9,8 +9,8 @@ Delete a snapshot from disk
 
 Parameters
 **********
-- **snapshot_id**: Snasphot UUID
 - **project_id**: Project UUID
+- **snapshot_id**: Snasphot UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst b/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst
index 45c08227..7c55a564 100644
--- a/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst
+++ b/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst
@@ -9,8 +9,8 @@ Restore a snapshot from disk
 
 Parameters
 **********
-- **snapshot_id**: Snasphot UUID
 - **project_id**: Project UUID
+- **snapshot_id**: Snasphot UUID
 
 Response status codes
 **********************
@@ -30,6 +30,8 @@ Output
     <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
     <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
     <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>scene_height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the drawing area</td>                     </tr>
+    <tr><td>scene_width</td>                    <td> </td>                     <td>integer</td>                     <td>Width of the drawing area</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
     </table>
 
diff --git a/docs/gns3_file.json b/docs/gns3_file.json
index 9ebd3208..b9c88280 100644
--- a/docs/gns3_file.json
+++ b/docs/gns3_file.json
@@ -1,24 +1,46 @@
 {
-    "required": [
-        "project_id",
-        "type",
-        "revision",
-        "version",
-        "name",
-        "topology"
-    ],
-    "additionalProperties": false,
-    "description": "The topology",
-    "type": "object",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "properties": {
-        "name": {
-            "description": "Name of the project",
-            "type": "string"
+        "project_id": {
+            "minLength": 36,
+            "type": "string",
+            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+            "maxLength": 36,
+            "description": "Project UUID"
         },
         "revision": {
-            "description": "Version of the .gns3 specification.",
-            "type": "integer"
+            "type": "integer",
+            "description": "Version of the .gns3 specification."
+        },
+        "auto_close": {
+            "type": "boolean",
+            "description": "Close the topology when no client is connected"
+        },
+        "version": {
+            "type": "string",
+            "description": "Version of the GNS3 software which have update the file for the last time"
+        },
+        "scene_width": {
+            "type": "integer",
+            "description": "Width of the drawing area"
+        },
+        "name": {
+            "type": "string",
+            "description": "Name of the project"
+        },
+        "scene_height": {
+            "type": "integer",
+            "description": "Height of the drawing area"
+        },
+        "auto_open": {
+            "type": "boolean",
+            "description": "Open the topology with GNS3"
+        },
+        "type": {
+            "enum": [
+                "topology"
+            ],
+            "description": "Type of file. It's always topology"
         },
         "topology": {
             "required": [
@@ -27,106 +49,185 @@
                 "drawings",
                 "computes"
             ],
+            "additionalProperties": false,
+            "type": "object",
             "properties": {
                 "drawings": {
                     "items": {
+                        "additionalProperties": false,
                         "$schema": "http://json-schema.org/draft-04/schema#",
+                        "type": "object",
                         "properties": {
+                            "project_id": {
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                                "maxLength": 36,
+                                "description": "Project UUID"
+                            },
                             "rotation": {
-                                "maximum": 360,
                                 "minimum": -359,
-                                "description": "Rotation of the element",
-                                "type": "integer"
-                            },
-                            "drawing_id": {
-                                "maxLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-                                "description": "Drawing UUID",
-                                "type": "string",
-                                "minLength": 36
+                                "type": "integer",
+                                "maximum": 360,
+                                "description": "Rotation of the element"
                             },
-                            "project_id": {
-                                "maxLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-                                "description": "Project UUID",
+                            "svg": {
                                 "type": "string",
-                                "minLength": 36
+                                "description": "SVG content of the drawing"
                             },
                             "x": {
-                                "description": "X property",
-                                "type": "integer"
+                                "type": "integer",
+                                "description": "X property"
                             },
                             "z": {
-                                "description": "Z property",
-                                "type": "integer"
-                            },
-                            "svg": {
-                                "description": "SVG content of the drawing",
-                                "type": "string"
+                                "type": "integer",
+                                "description": "Z property"
                             },
                             "y": {
-                                "description": "Y property",
-                                "type": "integer"
+                                "type": "integer",
+                                "description": "Y property"
+                            },
+                            "drawing_id": {
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                                "maxLength": 36,
+                                "description": "Drawing UUID"
                             }
                         },
-                        "additionalProperties": false,
-                        "description": "An drawing object",
-                        "type": "object"
+                        "description": "An drawing object"
                     },
-                    "description": "Drawings elements",
-                    "type": "array"
+                    "type": "array",
+                    "description": "Drawings elements"
                 },
-                "computes": {
+                "links": {
                     "items": {
-                        "required": [
-                            "compute_id",
-                            "protocol",
-                            "host",
-                            "port",
-                            "name"
-                        ],
-                        "additionalProperties": false,
-                        "description": "Request validation to a GNS3 compute object instance",
-                        "type": "object",
                         "$schema": "http://json-schema.org/draft-04/schema#",
                         "properties": {
-                            "name": {
-                                "description": "Server name",
-                                "type": "string"
+                            "project_id": {
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                                "maxLength": 36,
+                                "description": "Project UUID"
                             },
-                            "cpu_usage_percent": {
-                                "maximum": 100,
-                                "description": "CPU usage of the compute. Read only",
+                            "capture_file_name": {
                                 "type": [
-                                    "number",
+                                    "string",
                                     "null"
                                 ],
-                                "minimum": 0
-                            },
-                            "connected": {
-                                "description": "Whether the controller is connected to the compute server or not",
-                                "type": "boolean"
+                                "description": "Read only property. The name of the capture file if capture is running"
                             },
-                            "memory_usage_percent": {
-                                "maximum": 100,
-                                "description": "RAM usage of the compute. Read only",
+                            "capture_file_path": {
                                 "type": [
-                                    "number",
+                                    "string",
                                     "null"
                                 ],
-                                "minimum": 0
+                                "description": "Read only property. The full path of the capture file if capture is running"
                             },
-                            "capabilities": {
-                                "required": [
-                                    "version",
-                                    "node_types"
+                            "nodes": {
+                                "items": {
+                                    "required": [
+                                        "node_id",
+                                        "adapter_number",
+                                        "port_number"
+                                    ],
+                                    "additionalProperties": false,
+                                    "type": "object",
+                                    "properties": {
+                                        "adapter_number": {
+                                            "type": "integer",
+                                            "description": "Adapter number"
+                                        },
+                                        "label": {
+                                            "required": [
+                                                "text",
+                                                "x",
+                                                "y"
+                                            ],
+                                            "additionalProperties": false,
+                                            "type": "object",
+                                            "properties": {
+                                                "y": {
+                                                    "type": "integer",
+                                                    "description": "Relative Y position of the label"
+                                                },
+                                                "x": {
+                                                    "type": [
+                                                        "integer",
+                                                        "null"
+                                                    ],
+                                                    "description": "Relative X position of the label. If null center it"
+                                                },
+                                                "text": {
+                                                    "type": "string"
+                                                },
+                                                "rotation": {
+                                                    "minimum": -359,
+                                                    "type": "integer",
+                                                    "maximum": 360,
+                                                    "description": "Rotation of the label"
+                                                },
+                                                "style": {
+                                                    "type": "string",
+                                                    "description": "SVG style attribute"
+                                                }
+                                            }
+                                        },
+                                        "port_number": {
+                                            "type": "integer",
+                                            "description": "Port number"
+                                        },
+                                        "node_id": {
+                                            "minLength": 36,
+                                            "type": "string",
+                                            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                                            "maxLength": 36,
+                                            "description": "Node UUID"
+                                        }
+                                    }
+                                },
+                                "type": "array",
+                                "description": "List of the VMS"
+                            },
+                            "capturing": {
+                                "type": "boolean",
+                                "description": "Read only property. True if a capture running on the link"
+                            },
+                            "link_id": {
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                                "maxLength": 36,
+                                "description": "Link UUID"
+                            },
+                            "link_type": {
+                                "enum": [
+                                    "ethernet",
+                                    "serial"
                                 ],
-                                "additionalProperties": false,
-                                "description": "Get what a server support",
-                                "type": "object",
+                                "description": "Type of link"
+                            }
+                        },
+                        "required": [
+                            "nodes"
+                        ],
+                        "additionalProperties": false,
+                        "type": "object",
+                        "description": "A link object"
+                    },
+                    "type": "array",
+                    "description": "Link elements"
+                },
+                "computes": {
+                    "items": {
+                        "$schema": "http://json-schema.org/draft-04/schema#",
+                        "properties": {
+                            "capabilities": {
                                 "$schema": "http://json-schema.org/draft-04/schema#",
                                 "properties": {
                                     "node_types": {
+                                        "type": "array",
                                         "items": {
                                             "enum": [
                                                 "cloud",
@@ -144,32 +245,40 @@
                                                 "qemu"
                                             ],
                                             "description": "Type of node"
-                                        },
-                                        "type": "array"
+                                        }
                                     },
                                     "version": {
-                                        "description": "Version number",
                                         "type": [
                                             "string",
                                             "null"
-                                        ]
+                                        ],
+                                        "description": "Version number"
                                     }
-                                }
+                                },
+                                "required": [
+                                    "version",
+                                    "node_types"
+                                ],
+                                "additionalProperties": false,
+                                "type": "object",
+                                "description": "Get what a server support"
                             },
-                            "compute_id": {
-                                "description": "Server identifier",
-                                "type": "string"
+                            "cpu_usage_percent": {
+                                "maximum": 100,
+                                "type": [
+                                    "number",
+                                    "null"
+                                ],
+                                "minimum": 0,
+                                "description": "CPU usage of the compute. Read only"
                             },
                             "host": {
-                                "description": "Server host",
-                                "type": "string"
+                                "type": "string",
+                                "description": "Server host"
                             },
-                            "user": {
-                                "description": "User for authentication",
-                                "type": [
-                                    "string",
-                                    "null"
-                                ]
+                            "port": {
+                                "type": "integer",
+                                "description": "Server port"
                             },
                             "protocol": {
                                 "enum": [
@@ -178,236 +287,118 @@
                                 ],
                                 "description": "Server protocol"
                             },
-                            "port": {
-                                "description": "Server port",
-                                "type": "integer"
+                            "name": {
+                                "type": "string",
+                                "description": "Server name"
+                            },
+                            "user": {
+                                "type": [
+                                    "string",
+                                    "null"
+                                ],
+                                "description": "User for authentication"
+                            },
+                            "memory_usage_percent": {
+                                "maximum": 100,
+                                "type": [
+                                    "number",
+                                    "null"
+                                ],
+                                "minimum": 0,
+                                "description": "RAM usage of the compute. Read only"
+                            },
+                            "compute_id": {
+                                "type": "string",
+                                "description": "Server identifier"
+                            },
+                            "connected": {
+                                "type": "boolean",
+                                "description": "Whether the controller is connected to the compute server or not"
                             }
-                        }
-                    },
-                    "description": "Computes servers",
-                    "type": "array"
-                },
-                "links": {
-                    "items": {
+                        },
                         "required": [
-                            "nodes"
+                            "compute_id",
+                            "protocol",
+                            "host",
+                            "port",
+                            "name"
                         ],
                         "additionalProperties": false,
-                        "description": "A link object",
                         "type": "object",
+                        "description": "Request validation to a GNS3 compute object instance"
+                    },
+                    "type": "array",
+                    "description": "Computes servers"
+                },
+                "nodes": {
+                    "items": {
                         "$schema": "http://json-schema.org/draft-04/schema#",
                         "properties": {
-                            "nodes": {
+                            "ports": {
                                 "items": {
-                                    "required": [
-                                        "node_id",
-                                        "adapter_number",
-                                        "port_number"
-                                    ],
+                                    "additionalProperties": false,
+                                    "type": "object",
                                     "properties": {
-                                        "node_id": {
-                                            "maxLength": 36,
-                                            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-                                            "description": "Node UUID",
+                                        "adapter_number": {
+                                            "type": "integer",
+                                            "description": "Adapter slot"
+                                        },
+                                        "port_number": {
+                                            "type": "integer",
+                                            "description": "Port slot"
+                                        },
+                                        "short_name": {
                                             "type": "string",
-                                            "minLength": 36
+                                            "description": "Short version of port name"
                                         },
-                                        "label": {
-                                            "required": [
-                                                "text",
-                                                "x",
-                                                "y"
+                                        "data_link_types": {
+                                            "type": "object",
+                                            "properties": {},
+                                            "description": "Available PCAP type for capture"
+                                        },
+                                        "link_type": {
+                                            "enum": [
+                                                "ethernet",
+                                                "serial"
                                             ],
-                                            "properties": {
-                                                "rotation": {
-                                                    "maximum": 360,
-                                                    "minimum": -359,
-                                                    "description": "Rotation of the label",
-                                                    "type": "integer"
-                                                },
-                                                "style": {
-                                                    "description": "SVG style attribute",
-                                                    "type": "string"
-                                                },
-                                                "text": {
-                                                    "type": "string"
-                                                },
-                                                "y": {
-                                                    "description": "Relative Y position of the label",
-                                                    "type": "integer"
-                                                },
-                                                "x": {
-                                                    "description": "Relative X position of the label. If null center it",
-                                                    "type": [
-                                                        "integer",
-                                                        "null"
-                                                    ]
-                                                }
-                                            },
-                                            "additionalProperties": false,
-                                            "type": "object"
-                                        },
-                                        "adapter_number": {
-                                            "description": "Adapter number",
-                                            "type": "integer"
+                                            "description": "Type of link"
                                         },
-                                        "port_number": {
-                                            "description": "Port number",
-                                            "type": "integer"
+                                        "name": {
+                                            "type": "string",
+                                            "description": "Port name"
                                         }
                                     },
-                                    "additionalProperties": false,
-                                    "type": "object"
+                                    "description": "A node port"
                                 },
-                                "description": "List of the VMS",
-                                "type": "array"
+                                "type": "array",
+                                "description": "List of node ports READ only"
                             },
-                            "capture_file_path": {
-                                "description": "Read only property. The full path of the capture file if capture is running",
+                            "console": {
+                                "minimum": 1,
+                                "maximum": 65535,
                                 "type": [
-                                    "string",
+                                    "integer",
                                     "null"
-                                ]
+                                ],
+                                "description": "Console TCP port"
                             },
-                            "project_id": {
-                                "maxLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-                                "description": "Project UUID",
+                            "node_id": {
+                                "minLength": 36,
                                 "type": "string",
-                                "minLength": 36
-                            },
-                            "capturing": {
-                                "description": "Read only property. True if a capture running on the link",
-                                "type": "boolean"
-                            },
-                            "link_id": {
-                                "maxLength": 36,
                                 "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-                                "description": "Link UUID",
-                                "type": "string",
-                                "minLength": 36
+                                "maxLength": 36,
+                                "description": "Node UUID"
                             },
-                            "capture_file_name": {
-                                "description": "Read only property. The name of the capture file if capture is running",
+                            "first_port_name": {
                                 "type": [
                                     "string",
                                     "null"
-                                ]
-                            }
-                        }
-                    },
-                    "description": "Link elements",
-                    "type": "array"
-                },
-                "nodes": {
-                    "items": {
-                        "additionalProperties": false,
-                        "description": "A node object",
-                        "type": "object",
-                        "$schema": "http://json-schema.org/draft-04/schema#",
-                        "properties": {
-                            "name": {
-                                "description": "Node name",
-                                "type": "string",
-                                "minLength": 1
-                            },
-                            "label": {
-                                "required": [
-                                    "text",
-                                    "x",
-                                    "y"
                                 ],
-                                "properties": {
-                                    "rotation": {
-                                        "maximum": 360,
-                                        "minimum": -359,
-                                        "description": "Rotation of the label",
-                                        "type": "integer"
-                                    },
-                                    "style": {
-                                        "description": "SVG style attribute",
-                                        "type": "string"
-                                    },
-                                    "text": {
-                                        "type": "string"
-                                    },
-                                    "y": {
-                                        "description": "Relative Y position of the label",
-                                        "type": "integer"
-                                    },
-                                    "x": {
-                                        "description": "Relative X position of the label. If null center it",
-                                        "type": [
-                                            "integer",
-                                            "null"
-                                        ]
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "type": "object"
-                            },
-                            "height": {
-                                "description": "Height of the node (Read only)",
-                                "type": "integer"
-                            },
-                            "project_id": {
-                                "maxLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-                                "description": "Project UUID",
-                                "type": "string",
-                                "minLength": 36
+                                "description": "Name of the first port"
                             },
                             "compute_id": {
-                                "description": "Compute identifier",
-                                "type": "string"
-                            },
-                            "x": {
-                                "description": "X position of the node",
-                                "type": "integer"
-                            },
-                            "command_line": {
-                                "description": "Command line use to start the node",
-                                "type": [
-                                    "null",
-                                    "string"
-                                ]
-                            },
-                            "console_host": {
-                                "description": "Console host",
-                                "type": "string",
-                                "minLength": 1
-                            },
-                            "console": {
-                                "maximum": 65535,
-                                "minimum": 1,
-                                "description": "Console TCP port",
-                                "type": [
-                                    "integer",
-                                    "null"
-                                ]
-                            },
-                            "symbol": {
-                                "description": "Symbol of the node",
                                 "type": "string",
-                                "minLength": 1
-                            },
-                            "node_directory": {
-                                "description": "Working directory of the node. Read only",
-                                "type": [
-                                    "null",
-                                    "string"
-                                ]
-                            },
-                            "port_name_format": {
-                                "description": "Formating for port name {0} will be replace by port number",
-                                "type": "string"
-                            },
-                            "first_port_name": {
-                                "description": "Name of the first port",
-                                "type": [
-                                    "string",
-                                    "null"
-                                ]
+                                "description": "Compute identifier"
                             },
                             "node_type": {
                                 "enum": [
@@ -427,54 +418,6 @@
                                 ],
                                 "description": "Type of node"
                             },
-                            "width": {
-                                "description": "Width of the node (Read only)",
-                                "type": "integer"
-                            },
-                            "ports": {
-                                "items": {
-                                    "properties": {
-                                        "name": {
-                                            "description": "Port name",
-                                            "type": "string"
-                                        },
-                                        "data_link_types": {
-                                            "properties": {},
-                                            "description": "Available PCAP type for capture",
-                                            "type": "object"
-                                        },
-                                        "link_type": {
-                                            "enum": [
-                                                "ethernet",
-                                                "serial"
-                                            ],
-                                            "description": "Type of link"
-                                        },
-                                        "short_name": {
-                                            "description": "Short version of port name",
-                                            "type": "string"
-                                        },
-                                        "port_number": {
-                                            "description": "Port slot",
-                                            "type": "integer"
-                                        },
-                                        "adapter_number": {
-                                            "description": "Adapter slot",
-                                            "type": "integer"
-                                        }
-                                    },
-                                    "additionalProperties": false,
-                                    "description": "A node port",
-                                    "type": "object"
-                                },
-                                "description": "List of node ports READ only",
-                                "type": "array"
-                            },
-                            "port_segment_size": {
-                                "minimum": 0,
-                                "description": "Size of the port segment",
-                                "type": "integer"
-                            },
                             "status": {
                                 "enum": [
                                     "stopped",
@@ -483,24 +426,10 @@
                                 ],
                                 "description": "Status of the node"
                             },
-                            "y": {
-                                "description": "Y position of the node",
-                                "type": "integer"
-                            },
-                            "properties": {
-                                "description": "Properties specific to an emulator",
-                                "type": "object"
-                            },
-                            "node_id": {
-                                "maxLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-                                "description": "Node UUID",
-                                "type": "string",
-                                "minLength": 36
-                            },
-                            "z": {
-                                "description": "Z position of the node",
-                                "type": "integer"
+                            "port_segment_size": {
+                                "minimum": 0,
+                                "type": "integer",
+                                "description": "Size of the port segment"
                             },
                             "console_type": {
                                 "enum": [
@@ -510,45 +439,131 @@
                                     null
                                 ],
                                 "description": "Console type"
+                            },
+                            "symbol": {
+                                "minLength": 1,
+                                "type": "string",
+                                "description": "Symbol of the node"
+                            },
+                            "project_id": {
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                                "maxLength": 36,
+                                "description": "Project UUID"
+                            },
+                            "label": {
+                                "required": [
+                                    "text",
+                                    "x",
+                                    "y"
+                                ],
+                                "additionalProperties": false,
+                                "type": "object",
+                                "properties": {
+                                    "y": {
+                                        "type": "integer",
+                                        "description": "Relative Y position of the label"
+                                    },
+                                    "x": {
+                                        "type": [
+                                            "integer",
+                                            "null"
+                                        ],
+                                        "description": "Relative X position of the label. If null center it"
+                                    },
+                                    "text": {
+                                        "type": "string"
+                                    },
+                                    "rotation": {
+                                        "minimum": -359,
+                                        "type": "integer",
+                                        "maximum": 360,
+                                        "description": "Rotation of the label"
+                                    },
+                                    "style": {
+                                        "type": "string",
+                                        "description": "SVG style attribute"
+                                    }
+                                }
+                            },
+                            "node_directory": {
+                                "type": [
+                                    "null",
+                                    "string"
+                                ],
+                                "description": "Working directory of the node. Read only"
+                            },
+                            "x": {
+                                "type": "integer",
+                                "description": "X position of the node"
+                            },
+                            "console_host": {
+                                "minLength": 1,
+                                "type": "string",
+                                "description": "Console host"
+                            },
+                            "y": {
+                                "type": "integer",
+                                "description": "Y position of the node"
+                            },
+                            "width": {
+                                "type": "integer",
+                                "description": "Width of the node (Read only)"
+                            },
+                            "port_name_format": {
+                                "type": "string",
+                                "description": "Formating for port name {0} will be replace by port number"
+                            },
+                            "command_line": {
+                                "type": [
+                                    "null",
+                                    "string"
+                                ],
+                                "description": "Command line use to start the node"
+                            },
+                            "properties": {
+                                "type": "object",
+                                "description": "Properties specific to an emulator"
+                            },
+                            "z": {
+                                "type": "integer",
+                                "description": "Z position of the node"
+                            },
+                            "name": {
+                                "minLength": 1,
+                                "type": "string",
+                                "description": "Node name"
+                            },
+                            "height": {
+                                "type": "integer",
+                                "description": "Height of the node (Read only)"
                             }
-                        }
+                        },
+                        "additionalProperties": false,
+                        "type": "object",
+                        "description": "A node object"
                     },
-                    "description": "Nodes elements",
-                    "type": "array"
+                    "type": "array",
+                    "description": "Nodes elements"
                 }
             },
-            "additionalProperties": false,
-            "description": "The topology content",
-            "type": "object"
-        },
-        "project_id": {
-            "maxLength": 36,
-            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-            "description": "Project UUID",
-            "type": "string",
-            "minLength": 36
-        },
-        "type": {
-            "enum": [
-                "topology"
-            ],
-            "description": "Type of file. It's always topology"
-        },
-        "auto_open": {
-            "description": "Open the topology with GNS3",
-            "type": "boolean"
-        },
-        "auto_close": {
-            "description": "Close the topology when no client is connected",
-            "type": "boolean"
-        },
-        "version": {
-            "description": "Version of the GNS3 software which have update the file for the last time",
-            "type": "string"
+            "description": "The topology content"
         },
         "auto_start": {
-            "description": "Start the topology when opened",
-            "type": "boolean"
+            "type": "boolean",
+            "description": "Start the topology when opened"
         }
-    }
+    },
+    "required": [
+        "project_id",
+        "type",
+        "revision",
+        "version",
+        "name",
+        "topology"
+    ],
+    "additionalProperties": false,
+    "type": "object",
+    "description": "The topology"
 }
\ No newline at end of file