Merge with defaultbug23675

4 files changed, 1042 insertions, 1041 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/amqp-rabbitmq-0.8.json b/amqp-rabbitmq-0.8.json
index aa48098..4dfe7d9 100644
--- a/amqp-rabbitmq-0.8.json
+++ b/amqp-rabbitmq-0.8.json
@@ -14,11 +14,11 @@
         "sublicense, and/or sell copies of the Software, and to permit \n",
         "persons to whom the Software is furnished to do so, subject to \n",
         "the following conditions:\n",
-	"\n",
-	"The above copyright notice and this permission notice shall be\n",
+        "\n",
+        "The above copyright notice and this permission notice shall be\n",
         "included in all copies or substantial portions of the Software.\n",
-	"\n",
-	"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n",
+        "\n",
+        "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n",
         "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\n",
         "OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n",
         "NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n",
@@ -26,635 +26,635 @@
         "WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n",
         "FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n",
         "OTHER DEALINGS IN THE SOFTWARE.\n",
-	"\n",
-	"Class information entered from amqp_xml0-8.pdf and domain types from amqp-xml-doc0-9.pdf\n",
-	"\n",
-	"b3cb053f15e7b98808c0ccc67f23cb3e  amqp_xml0-8.pdf\n",
+        "\n",
+        "Class information entered from amqp_xml0-8.pdf and domain types from amqp-xml-doc0-9.pdf\n",
+        "\n",
+        "b3cb053f15e7b98808c0ccc67f23cb3e  amqp_xml0-8.pdf\n",
         "http://www.twiststandards.org/index.php?option=com_docman&task=cat_view&gid=28&&Itemid=90\n",
         "8444db91e2949dbecfb2585e9eef6d64  amqp-xml-doc0-9.pdf\n",
         "https://jira.amqp.org/confluence/download/attachments/720900/amqp-xml-doc0-9.pdf?version=1\n"],
 
     "domains": [
-	["access-ticket", "short"],
-	["bit", "bit"],
-	["channel-id", "longstr"],
-	["class-id", "short"],
-	["consumer-tag", "shortstr"],
-	["delivery-tag", "longlong"],
-	["destination", "shortstr"],
-	["duration", "longlong"],
-	["exchange-name", "shortstr"],
-	["known-hosts", "shortstr"],
-	["long", "long"],
-	["longlong", "longlong"],
-	["longstr", "longstr"],
-	["method-id", "short"],
-	["no-ack", "bit"],
-	["no-local", "bit"],
-	["octet", "octet"],
-	["offset", "longlong"],
-	["path", "shortstr"],
-	["peer-properties", "table"],
-	["queue-name", "shortstr"],
-	["redelivered", "bit"],
-	["reference", "longstr"],
-	["reject-code", "short"],
-	["reject-text", "shortstr"],
-	["reply-code", "short"],
-	["reply-text", "shortstr"],
-	["security-token", "longstr"],
-	["short", "short"],
-	["shortstr", "shortstr"],
-	["table", "table"],
-	["timestamp", "timestamp"]
+        ["access-ticket", "short"],
+        ["bit", "bit"],
+        ["channel-id", "longstr"],
+        ["class-id", "short"],
+        ["consumer-tag", "shortstr"],
+        ["delivery-tag", "longlong"],
+        ["destination", "shortstr"],
+        ["duration", "longlong"],
+        ["exchange-name", "shortstr"],
+        ["known-hosts", "shortstr"],
+        ["long", "long"],
+        ["longlong", "longlong"],
+        ["longstr", "longstr"],
+        ["method-id", "short"],
+        ["no-ack", "bit"],
+        ["no-local", "bit"],
+        ["octet", "octet"],
+        ["offset", "longlong"],
+        ["path", "shortstr"],
+        ["peer-properties", "table"],
+        ["queue-name", "shortstr"],
+        ["redelivered", "bit"],
+        ["reference", "longstr"],
+        ["reject-code", "short"],
+        ["reject-text", "shortstr"],
+        ["reply-code", "short"],
+        ["reply-text", "shortstr"],
+        ["security-token", "longstr"],
+        ["short", "short"],
+        ["shortstr", "shortstr"],
+        ["table", "table"],
+        ["timestamp", "timestamp"]
     ],
 
     "constants": [
-	{"name": "FRAME-METHOD", "value": 1},
-	{"name": "FRAME-HEADER", "value": 2},
-	{"name": "FRAME-BODY", "value": 3},
-	{"name": "FRAME-OOB-METHOD", "value": 4},
-	{"name": "FRAME-OOB-HEADER", "value": 5},
-	{"name": "FRAME-OOB-BODY", "value": 6},
-	{"name": "FRAME-TRACE", "value": 7},
-	{"name": "FRAME-HEARTBEAT", "value": 8},
-	{"name": "FRAME-MIN-SIZE", "value": 4096},
-	{"name": "FRAME-END", "value": 206},
-	{"name": "REPLY-SUCCESS", "value": 200},
-	{"name": "NOT-DELIVERED", "value": 310, "class": "soft-error"},
-	{"name": "CONTENT-TOO-LARGE", "value": 311, "class": "soft-error"},
-	{"name": "NO-ROUTE", "value": 312, "class": "soft-error"},
-	{"name": "NO-CONSUMERS", "value": 313, "class": "soft-error"},
-	{"name": "ACCESS-REFUSED", "value": 403, "class": "soft-error"},
-	{"name": "NOT-FOUND", "value": 404, "class": "soft-error"},
-	{"name": "RESOURCE-LOCKED", "value": 405, "class": "soft-error"},
-	{"name": "PRECONDITION-FAILED", "value": 406, "class": "soft-error"},
-	{"name": "CONNECTION-FORCED", "value": 320, "class": "hard-error"},
-	{"name": "INVALID-PATH", "value": 402, "class": "hard-error"},
-	{"name": "FRAME-ERROR", "value": 501, "class": "hard-error"},
-	{"name": "SYNTAX-ERROR", "value": 502, "class": "hard-error"},
-	{"name": "COMMAND-INVALID", "value": 503, "class": "hard-error"},
-	{"name": "CHANNEL-ERROR", "value": 504, "class": "hard-error"},
-	{"name": "UNEXPECTED-FRAME", "value": 505, "class": "hard-error"},
-	{"name": "RESOURCE-ERROR", "value": 506, "class": "hard-error"},
-	{"name": "NOT-ALLOWED", "value": 530, "class": "hard-error"},
-	{"name": "NOT-IMPLEMENTED", "value": 540, "class": "hard-error"},
-	{"name": "INTERNAL-ERROR", "value": 541, "class": "hard-error"}
+        {"name": "FRAME-METHOD", "value": 1},
+        {"name": "FRAME-HEADER", "value": 2},
+        {"name": "FRAME-BODY", "value": 3},
+        {"name": "FRAME-OOB-METHOD", "value": 4},
+        {"name": "FRAME-OOB-HEADER", "value": 5},
+        {"name": "FRAME-OOB-BODY", "value": 6},
+        {"name": "FRAME-TRACE", "value": 7},
+        {"name": "FRAME-HEARTBEAT", "value": 8},
+        {"name": "FRAME-MIN-SIZE", "value": 4096},
+        {"name": "FRAME-END", "value": 206},
+        {"name": "REPLY-SUCCESS", "value": 200},
+        {"name": "NOT-DELIVERED", "value": 310, "class": "soft-error"},
+        {"name": "CONTENT-TOO-LARGE", "value": 311, "class": "soft-error"},
+        {"name": "NO-ROUTE", "value": 312, "class": "soft-error"},
+        {"name": "NO-CONSUMERS", "value": 313, "class": "soft-error"},
+        {"name": "ACCESS-REFUSED", "value": 403, "class": "soft-error"},
+        {"name": "NOT-FOUND", "value": 404, "class": "soft-error"},
+        {"name": "RESOURCE-LOCKED", "value": 405, "class": "soft-error"},
+        {"name": "PRECONDITION-FAILED", "value": 406, "class": "soft-error"},
+        {"name": "CONNECTION-FORCED", "value": 320, "class": "hard-error"},
+        {"name": "INVALID-PATH", "value": 402, "class": "hard-error"},
+        {"name": "FRAME-ERROR", "value": 501, "class": "hard-error"},
+        {"name": "SYNTAX-ERROR", "value": 502, "class": "hard-error"},
+        {"name": "COMMAND-INVALID", "value": 503, "class": "hard-error"},
+        {"name": "CHANNEL-ERROR", "value": 504, "class": "hard-error"},
+        {"name": "UNEXPECTED-FRAME", "value": 505, "class": "hard-error"},
+        {"name": "RESOURCE-ERROR", "value": 506, "class": "hard-error"},
+        {"name": "NOT-ALLOWED", "value": 530, "class": "hard-error"},
+        {"name": "NOT-IMPLEMENTED", "value": 540, "class": "hard-error"},
+        {"name": "INTERNAL-ERROR", "value": 541, "class": "hard-error"}
     ],
 
     "classes": [
-	{
-	    "id": 10,
-	    "methods": [{"id": 10,
+        {
+            "id": 10,
+            "methods": [{"id": 10,
                          "arguments": [{"type": "octet", "name": "version-major", "default-value": 0},
-				       {"type": "octet", "name": "version-minor", "default-value": 8},
-				       {"domain": "peer-properties", "name": "server properties"},
-				       {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"},
-				       {"type": "longstr", "name": "locales", "default-value": "en_US"}],
-			 "name": "start",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [{"domain": "peer-properties", "name": "client-properties"},
-				       {"type": "shortstr", "name": "mechanism", "default-value": "PLAIN"},
-				       {"type": "longstr", "name": "response"},
-				       {"type": "shortstr", "name": "locale", "default-value": "en_US"}],
-			 "name": "start-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "longstr", "name": "challenge"}],
-			 "name": "secure",
- 			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "longstr", "name": "response"}],
-			 "name": "secure-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
-				       {"type": "long", "name": "frame-max", "default-value": 0},
-				       {"type": "short", "name": "heartbeat", "default-value": 0}],
-			 "name": "tune",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
-				       {"type": "long", "name": "frame-max", "default-value": 0},
-				       {"type": "short", "name": "heartbeat", "default-value": 0}],
-			 "name": "tune-ok"},
-			{"id": 40,
-			 "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"},
-				       {"type": "shortstr", "name": "capabilities", "default-value": ""},
-				       {"type": "bit", "name": "insist", "default-value": false}],
-			 "name": "open",
-			 "synchronous" : true},
-			{"id": 41,
-			 "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}],
-			 "name": "open-ok"},
-			{"id": 50,
-			 "arguments": [{"type": "shortstr", "name": "host"},
-				       {"type": "shortstr", "name": "known-hosts", "default-value": ""}],
-			 "name": "redirect"},
-			{"id": 60,
-			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "short", "name": "class-id"},
-				       {"type": "short", "name": "method-id"}],
-			 "name": "close",
-			 "synchronous" : true},
-			{"id": 61,
-			 "arguments": [],
-			 "name": "close-ok"}],
-	    "name": "connection",
-	    "properties": []
-	},
-	{
-	    "id": 20,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "shortstr", "name": "out-of-band", "default-value": ""}],
-			 "name": "open",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "open-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "bit", "name": "active"}],
-			 "name": "flow",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "bit", "name": "active"}],
-			 "name": "flow-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "table", "name": "details", "default-value": {}}],
-			 "name": "alert"},
-			{"id": 40,
-			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "short", "name": "class-id"},
-				       {"type": "short", "name": "method-id"}],
-			 "name": "close",
-			 "synchronous" : true},
-			{"id": 41,
-			 "arguments": [],
-			 "name": "close-ok"}],
-	    "name": "channel"
-	},
-	{
-	    "id": 30,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "shortstr", "name": "realm", "default-value": "/data"},
-				       {"type": "bit", "name": "exclusive", "default-value": false},
-				       {"type": "bit", "name": "passive", "default-value": true},
-				       {"type": "bit", "name": "active", "default-value": true},
-				       {"type": "bit", "name": "write", "default-value": true},
-				       {"type": "bit", "name": "read", "default-value": true}],
-			 "name": "request",
-			 "synchronous" : true},
-			{"id": 11,
+                                       {"type": "octet", "name": "version-minor", "default-value": 8},
+                                       {"domain": "peer-properties", "name": "server properties"},
+                                       {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"},
+                                       {"type": "longstr", "name": "locales", "default-value": "en_US"}],
+                         "name": "start",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [{"domain": "peer-properties", "name": "client-properties"},
+                                       {"type": "shortstr", "name": "mechanism", "default-value": "PLAIN"},
+                                       {"type": "longstr", "name": "response"},
+                                       {"type": "shortstr", "name": "locale", "default-value": "en_US"}],
+                         "name": "start-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "longstr", "name": "challenge"}],
+                         "name": "secure",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "longstr", "name": "response"}],
+                         "name": "secure-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
+                                       {"type": "long", "name": "frame-max", "default-value": 0},
+                                       {"type": "short", "name": "heartbeat", "default-value": 0}],
+                         "name": "tune",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
+                                       {"type": "long", "name": "frame-max", "default-value": 0},
+                                       {"type": "short", "name": "heartbeat", "default-value": 0}],
+                         "name": "tune-ok"},
+                        {"id": 40,
+                         "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"},
+                                       {"type": "shortstr", "name": "capabilities", "default-value": ""},
+                                       {"type": "bit", "name": "insist", "default-value": false}],
+                         "name": "open",
+                         "synchronous" : true},
+                        {"id": 41,
+                         "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}],
+                         "name": "open-ok"},
+                        {"id": 50,
+                         "arguments": [{"type": "shortstr", "name": "host"},
+                                       {"type": "shortstr", "name": "known-hosts", "default-value": ""}],
+                         "name": "redirect"},
+                        {"id": 60,
+                         "arguments": [{"type": "short", "name": "reply-code"},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "short", "name": "class-id"},
+                                       {"type": "short", "name": "method-id"}],
+                         "name": "close",
+                         "synchronous" : true},
+                        {"id": 61,
+                         "arguments": [],
+                         "name": "close-ok"}],
+            "name": "connection",
+            "properties": []
+        },
+        {
+            "id": 20,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "shortstr", "name": "out-of-band", "default-value": ""}],
+                         "name": "open",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "open-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "bit", "name": "active"}],
+                         "name": "flow",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "bit", "name": "active"}],
+                         "name": "flow-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "short", "name": "reply-code"},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "table", "name": "details", "default-value": {}}],
+                         "name": "alert"},
+                        {"id": 40,
+                         "arguments": [{"type": "short", "name": "reply-code"},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "short", "name": "class-id"},
+                                       {"type": "short", "name": "method-id"}],
+                         "name": "close",
+                         "synchronous" : true},
+                        {"id": 41,
+                         "arguments": [],
+                         "name": "close-ok"}],
+            "name": "channel"
+        },
+        {
+            "id": 30,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "shortstr", "name": "realm", "default-value": "/data"},
+                                       {"type": "bit", "name": "exclusive", "default-value": false},
+                                       {"type": "bit", "name": "passive", "default-value": true},
+                                       {"type": "bit", "name": "active", "default-value": true},
+                                       {"type": "bit", "name": "write", "default-value": true},
+                                       {"type": "bit", "name": "read", "default-value": true}],
+                         "name": "request",
+                         "synchronous" : true},
+                        {"id": 11,
                     "arguments": [{"type": "short", "name": "ticket", "default-value": 1}],
-			 "name": "request-ok"}],
-	    "name": "access"
-	},
-	{
-	    "id": 40,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "type", "default-value": "direct"},
-				       {"type": "bit", "name": "passive", "default-value": false},
-				       {"type": "bit", "name": "durable", "default-value": false},
-				       {"type": "bit", "name": "auto-delete", "default-value": false},
-				       {"type": "bit", "name": "internal", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "declare",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "declare-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "bit", "name": "if-unused", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "delete",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [],
-			 "name": "delete-ok"}],
-	    "name": "exchange"
-	},
-	{
-	    "id": 50,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                         "name": "request-ok"}],
+            "name": "access"
+        },
+        {
+            "id": 40,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "type", "default-value": "direct"},
+                                       {"type": "bit", "name": "passive", "default-value": false},
+                                       {"type": "bit", "name": "durable", "default-value": false},
+                                       {"type": "bit", "name": "auto-delete", "default-value": false},
+                                       {"type": "bit", "name": "internal", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "declare",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "declare-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "bit", "name": "if-unused", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "delete",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [],
+                         "name": "delete-ok"}],
+            "name": "exchange"
+        },
+        {
+            "id": 50,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
                            {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "bit", "name": "passive", "default-value": false},
-				       {"type": "bit", "name": "durable", "default-value": false},
-				       {"type": "bit", "name": "exclusive", "default-value": false},
-				       {"type": "bit", "name": "auto-delete", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "declare",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [{"type": "shortstr", "name": "queue"},
-				       {"type": "long", "name": "message-count"},
-				       {"type": "long", "name": "consumer-count"}],
-			 "name": "declare-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "bind",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [],
-			 "name": "bind-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "purge",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "long", "name": "message-count"}],
-			 "name": "purge-ok"},
-			{"id": 40,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "bit", "name": "if-unused", "default-value": false},
-				       {"type": "bit", "name": "if-empty", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "delete",
-			 "synchronous" : true},
-			{"id": 41,
-			 "arguments": [{"type": "long", "name": "message-count"}],
-			 "name": "delete-ok"},
+                                       {"type": "bit", "name": "passive", "default-value": false},
+                                       {"type": "bit", "name": "durable", "default-value": false},
+                                       {"type": "bit", "name": "exclusive", "default-value": false},
+                                       {"type": "bit", "name": "auto-delete", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "declare",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [{"type": "shortstr", "name": "queue"},
+                                       {"type": "long", "name": "message-count"},
+                                       {"type": "long", "name": "consumer-count"}],
+                         "name": "declare-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "bind",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [],
+                         "name": "bind-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "purge",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "long", "name": "message-count"}],
+                         "name": "purge-ok"},
+                        {"id": 40,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "bit", "name": "if-unused", "default-value": false},
+                                       {"type": "bit", "name": "if-empty", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "delete",
+                         "synchronous" : true},
+                        {"id": 41,
+                         "arguments": [{"type": "long", "name": "message-count"}],
+                         "name": "delete-ok"},
             {"id": 50,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "unbind",
-			 "synchronous" : true},
-			{"id": 51,
-			 "arguments": [],
-			 "name": "unbind-ok"}
-			],
-	    "name": "queue"
-	},
-	{
-	    "id": 60,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
-				       {"type": "short", "name": "prefetch-count", "default-value": 0},
-				       {"type": "bit", "name": "global", "default-value": false}],
-			 "name": "qos",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "qos-ok"},
-			{"id": 20,
-			 "arguments": [{"domain": "access-ticket", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
-				       {"type": "bit", "name": "no-local", "default-value": false},
-				       {"type": "bit", "name": "no-ack", "default-value": false},
-				       {"type": "bit", "name": "exclusive", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "consume",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
-			 "name": "consume-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "cancel",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
-			 "name": "cancel-ok"},
-			{"content": true,
-			 "id": 40,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "exchange", "default-value": ""},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "bit", "name": "mandatory", "default-value": false},
-				       {"type": "bit", "name": "immediate", "default-value": false}],
-			 "name": "publish"},
-			{"content": true,
-			 "id": 50,
-			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"}],
-			 "name": "return"},
-			{"content": true,
-			 "id": 60,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "redelivered", "default-value": false},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"}],
-			 "name": "deliver"},
-			{"id": 70,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "bit", "name": "no-ack", "default-value": false}],
-			 "name": "get",
-			 "synchronous" : true},
-			{"content": true,
-			 "id": 71,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "redelivered", "default-value": false},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "long", "name": "message-count"}],
-			 "name": "get-ok"},
-			{"id": 72,
-			 "arguments": [{"type": "shortstr", "name": "cluster-id", "default-value": ""}],
-			 "name": "get-empty"},
-			{"id": 80,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
-				       {"type": "bit", "name": "multiple", "default-value": false}],
-			 "name": "ack"},
-			{"id": 90,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "requeue", "default-value": true}],
-			 "name": "reject"},
-			{"id": 100,
-			 "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
-			 "name": "recover-async"},
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "unbind",
+                         "synchronous" : true},
+                        {"id": 51,
+                         "arguments": [],
+                         "name": "unbind-ok"}
+                        ],
+            "name": "queue"
+        },
+        {
+            "id": 60,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
+                                       {"type": "short", "name": "prefetch-count", "default-value": 0},
+                                       {"type": "bit", "name": "global", "default-value": false}],
+                         "name": "qos",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "qos-ok"},
+                        {"id": 20,
+                         "arguments": [{"domain": "access-ticket", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
+                                       {"type": "bit", "name": "no-local", "default-value": false},
+                                       {"type": "bit", "name": "no-ack", "default-value": false},
+                                       {"type": "bit", "name": "exclusive", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "consume",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
+                         "name": "consume-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "cancel",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
+                         "name": "cancel-ok"},
+                        {"content": true,
+                         "id": 40,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "exchange", "default-value": ""},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "bit", "name": "mandatory", "default-value": false},
+                                       {"type": "bit", "name": "immediate", "default-value": false}],
+                         "name": "publish"},
+                        {"content": true,
+                         "id": 50,
+                         "arguments": [{"type": "short", "name": "reply-code"},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"}],
+                         "name": "return"},
+                        {"content": true,
+                         "id": 60,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"},
+                                       {"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "bit", "name": "redelivered", "default-value": false},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"}],
+                         "name": "deliver"},
+                        {"id": 70,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "bit", "name": "no-ack", "default-value": false}],
+                         "name": "get",
+                         "synchronous" : true},
+                        {"content": true,
+                         "id": 71,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "bit", "name": "redelivered", "default-value": false},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"},
+                                       {"type": "long", "name": "message-count"}],
+                         "name": "get-ok"},
+                        {"id": 72,
+                         "arguments": [{"type": "shortstr", "name": "cluster-id", "default-value": ""}],
+                         "name": "get-empty"},
+                        {"id": 80,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
+                                       {"type": "bit", "name": "multiple", "default-value": false}],
+                         "name": "ack"},
+                        {"id": 90,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "bit", "name": "requeue", "default-value": true}],
+                         "name": "reject"},
+                        {"id": 100,
+                         "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
+                         "name": "recover-async"},
             {"id": 110,
-			 "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
-			 "name": "recover",
-			 "synchronous" : true},
-			{"id": 111,
-			 "arguments": [],
-			 "name": "recover-ok"}],
-	    "name": "basic",
-	    "properties": [{"type": "shortstr", "name": "content-type"},
-			   {"type": "shortstr", "name": "content-encoding"},
-			   {"type": "table", "name": "headers"},
-			   {"type": "octet", "name": "delivery-mode"},
-			   {"type": "octet", "name": "priority"},
-			   {"type": "shortstr", "name": "correlation-id"},
-			   {"type": "shortstr", "name": "reply-to"},
-			   {"type": "shortstr", "name": "expiration"},
-			   {"type": "shortstr", "name": "message-id"},
-			   {"type": "timestamp", "name": "timestamp"},
-			   {"type": "shortstr", "name": "type"},
-			   {"type": "shortstr", "name": "user-id"},
-			   {"type": "shortstr", "name": "app-id"},
-			   {"type": "shortstr", "name": "cluster-id"}]
-	},
-	{
-	    "id": 70,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
-				       {"type": "short", "name": "prefetch-count", "default-value": 0},
-				       {"type": "bit", "name": "global", "default-value": false}],
-			 "name": "qos",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "qos-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
-				       {"type": "bit", "name": "no-local", "default-value": false},
-				       {"type": "bit", "name": "no-ack", "default-value": false},
-				       {"type": "bit", "name": "exclusive", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "consume",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
-			 "name": "consume-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "cancel",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
-			 "name": "cancel-ok"},
-			{"id": 40,
-			 "arguments": [{"type": "shortstr", "name": "identifier"},
-				       {"type": "longlong", "name": "content-size"}],
-			 "name": "open",
-			 "synchronous" : true},
-			{"id": 41,
-			 "arguments": [{"type": "longlong", "name": "staged-size"}],
-			 "name": "open-ok"},
-			{"content": true,
-			 "id": 50,
-			 "arguments": [],
-			 "name": "stage"},
-			{"id": 60,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "exchange", "default-value": ""},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "bit", "name": "mandatory", "default-value": false},
-				       {"type": "bit", "name": "immediate", "default-value": false},
-				       {"type": "shortstr", "name": "identifier"}],
-			 "name": "publish"},
-			{"content": true,
-			 "id": 70,
-			 "arguments": [{"type": "short", "name": "reply-code", "default-value": 200},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"}],
-			 "name": "return"},
-			{"id": 80,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "redelivered", "default-value": false},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "shortstr", "name": "identifier"}],
-			 "name": "deliver"},
-			{"id": 90,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
+                         "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
+                         "name": "recover",
+                         "synchronous" : true},
+                        {"id": 111,
+                         "arguments": [],
+                         "name": "recover-ok"}],
+            "name": "basic",
+            "properties": [{"type": "shortstr", "name": "content-type"},
+                           {"type": "shortstr", "name": "content-encoding"},
+                           {"type": "table", "name": "headers"},
+                           {"type": "octet", "name": "delivery-mode"},
+                           {"type": "octet", "name": "priority"},
+                           {"type": "shortstr", "name": "correlation-id"},
+                           {"type": "shortstr", "name": "reply-to"},
+                           {"type": "shortstr", "name": "expiration"},
+                           {"type": "shortstr", "name": "message-id"},
+                           {"type": "timestamp", "name": "timestamp"},
+                           {"type": "shortstr", "name": "type"},
+                           {"type": "shortstr", "name": "user-id"},
+                           {"type": "shortstr", "name": "app-id"},
+                           {"type": "shortstr", "name": "cluster-id"}]
+        },
+        {
+            "id": 70,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
+                                       {"type": "short", "name": "prefetch-count", "default-value": 0},
+                                       {"type": "bit", "name": "global", "default-value": false}],
+                         "name": "qos",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "qos-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
+                                       {"type": "bit", "name": "no-local", "default-value": false},
+                                       {"type": "bit", "name": "no-ack", "default-value": false},
+                                       {"type": "bit", "name": "exclusive", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "consume",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
+                         "name": "consume-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "cancel",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
+                         "name": "cancel-ok"},
+                        {"id": 40,
+                         "arguments": [{"type": "shortstr", "name": "identifier"},
+                                       {"type": "longlong", "name": "content-size"}],
+                         "name": "open",
+                         "synchronous" : true},
+                        {"id": 41,
+                         "arguments": [{"type": "longlong", "name": "staged-size"}],
+                         "name": "open-ok"},
+                        {"content": true,
+                         "id": 50,
+                         "arguments": [],
+                         "name": "stage"},
+                        {"id": 60,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "exchange", "default-value": ""},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "bit", "name": "mandatory", "default-value": false},
+                                       {"type": "bit", "name": "immediate", "default-value": false},
+                                       {"type": "shortstr", "name": "identifier"}],
+                         "name": "publish"},
+                        {"content": true,
+                         "id": 70,
+                         "arguments": [{"type": "short", "name": "reply-code", "default-value": 200},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"}],
+                         "name": "return"},
+                        {"id": 80,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"},
+                                       {"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "bit", "name": "redelivered", "default-value": false},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"},
+                                       {"type": "shortstr", "name": "identifier"}],
+                         "name": "deliver"},
+                        {"id": 90,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
                            {"type": "bit", "name": "multiple", "default-value": false}],
-			 "name": "ack"},
-			{"id": 100,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "requeue", "default-value": true}],
-			 "name": "reject"}],
-	    "name": "file",
-	    "properties": [{"type": "shortstr", "name": "content-type"},
-			   {"type": "shortstr", "name": "content-encoding"},
-			   {"type": "table", "name": "headers"},
-			   {"type": "octet", "name": "priority"},
-			   {"type": "shortstr", "name": "reply-to"},
-			   {"type": "shortstr", "name": "message-id"},
-			   {"type": "shortstr", "name": "filename"},
-			   {"type": "timestamp", "name": "timestamp"},
-			   {"type": "shortstr", "name": "cluster-id"}]
-	},
-	{
-	    "id": 80,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
-				       {"type": "short", "name": "prefetch-count", "default-value": 0},
-				       {"type": "long", "name": "consume-rate", "default-value": 0},
-				       {"type": "bit", "name": "global", "default-value": false}],
-			 "name": "qos",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "qos-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
-				       {"type": "bit", "name": "no-local", "default-value": false},
-				       {"type": "bit", "name": "exclusive", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "consume",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
-			 "name": "consume-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "cancel",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
-			 "name": "cancel-ok"},
-			{"content": true,
-			 "id": 40,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
-				       {"type": "shortstr", "name": "exchange", "default-value": ""},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "bit", "name": "mandatory", "default-value": false},
-				       {"type": "bit", "name": "immediate", "default-value": false}],
-			 "name": "publish"},
-			{"content": true,
-			 "id": 50,
-			 "arguments": [{"type": "short", "name": "reply-code", "default-value": 200},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"}],
-			 "name": "return"},
-			{"content": true,
-			 "id": 60,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "longlong", "name": "delivery-tag"},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "queue"}],
-			 "name": "deliver"}],
-	    "name": "stream",
-	    "properties": [{"type": "shortstr", "name": "content-type"},
-			   {"type": "shortstr", "name": "content-encoding"},
-			   {"type": "table", "name": "headers"},
-			   {"type": "octet", "name": "priority"},
-			   {"type": "timestamp", "name": "timestamp"}]
-	},
-	{
-	    "id": 90,
-	    "methods": [{"id": 10,
-			 "arguments": [],
-			 "name": "select",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "select-ok"},
-			{"id": 20,
-			 "arguments": [],
-			 "name": "commit",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [],
-			 "name": "commit-ok"},
-			{"id": 30,
-			 "arguments": [],
-			 "name": "rollback",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [],
-			 "name": "rollback-ok"}],
-	    "name": "tx"
-	},
-	{
-	    "id": 100,
-	    "methods": [{"id": 10,
-			 "arguments": [],
-			 "name": "select",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "select-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "shortstr", "name": "dtx-identifier"}],
-			 "name": "start",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [], "name": "start-ok"}],
-	    "name": "dtx"
-	},
-	{
-	    "id": 110,
-	    "methods": [{"content": true,
-			 "id": 10,
-			 "arguments": [{"type": "table", "name": "meta-data"}],
-			 "name": "request"}],
-	    "name": "tunnel",
-	    "properties": [{"type": "table", "name": "headers"},
-			   {"type": "shortstr", "name": "proxy-name"},
-			   {"type": "shortstr", "name": "data-name"},
-			   {"type": "octet", "name": "durable"},
-			   {"type": "octet", "name": "broadcast"}]
-	},
-	{
-	    "id": 120,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "octet", "name": "integer-1"},
-				       {"type": "short", "name": "integer-2"},
-				       {"type": "long", "name": "integer-3"},
-				       {"type": "longlong", "name": "integer-4"},
-				       {"type": "octet", "name": "operation"}],
-			 "name": "integer",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [{"type": "longlong", "name": "result"}],
-			 "name": "integer-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "shortstr", "name": "string-1"},
-				       {"type": "longstr", "name": "string-2"},
-				       {"type": "octet", "name": "operation"}],
-			 "name": "string",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "longstr", "name": "result"}],
-			 "name": "string-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "table", "name": "table"},
-				       {"type": "octet", "name": "integer-op"},
-				       {"type": "octet", "name": "string-op"}],
-			 "name": "table",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "longlong", "name": "integer-result"},
-				       {"type": "longstr", "name": "string-result"}],
-			 "name": "table-ok"},
-			{"content": true,
-			 "id": 40,
-			 "arguments": [],
-			 "name": "content",
-			 "synchronous" : true},
-			{"content": true,
-			 "id": 41,
-			 "arguments": [{"type": "long", "name": "content-checksum"}],
-			 "name": "content-ok"}],
-	    "name": "test"
-	}
+                         "name": "ack"},
+                        {"id": 100,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "bit", "name": "requeue", "default-value": true}],
+                         "name": "reject"}],
+            "name": "file",
+            "properties": [{"type": "shortstr", "name": "content-type"},
+                           {"type": "shortstr", "name": "content-encoding"},
+                           {"type": "table", "name": "headers"},
+                           {"type": "octet", "name": "priority"},
+                           {"type": "shortstr", "name": "reply-to"},
+                           {"type": "shortstr", "name": "message-id"},
+                           {"type": "shortstr", "name": "filename"},
+                           {"type": "timestamp", "name": "timestamp"},
+                           {"type": "shortstr", "name": "cluster-id"}]
+        },
+        {
+            "id": 80,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
+                                       {"type": "short", "name": "prefetch-count", "default-value": 0},
+                                       {"type": "long", "name": "consume-rate", "default-value": 0},
+                                       {"type": "bit", "name": "global", "default-value": false}],
+                         "name": "qos",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "qos-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
+                                       {"type": "bit", "name": "no-local", "default-value": false},
+                                       {"type": "bit", "name": "exclusive", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "consume",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
+                         "name": "consume-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "cancel",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
+                         "name": "cancel-ok"},
+                        {"content": true,
+                         "id": 40,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+                                       {"type": "shortstr", "name": "exchange", "default-value": ""},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "bit", "name": "mandatory", "default-value": false},
+                                       {"type": "bit", "name": "immediate", "default-value": false}],
+                         "name": "publish"},
+                        {"content": true,
+                         "id": 50,
+                         "arguments": [{"type": "short", "name": "reply-code", "default-value": 200},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"}],
+                         "name": "return"},
+                        {"content": true,
+                         "id": 60,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"},
+                                       {"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "queue"}],
+                         "name": "deliver"}],
+            "name": "stream",
+            "properties": [{"type": "shortstr", "name": "content-type"},
+                           {"type": "shortstr", "name": "content-encoding"},
+                           {"type": "table", "name": "headers"},
+                           {"type": "octet", "name": "priority"},
+                           {"type": "timestamp", "name": "timestamp"}]
+        },
+        {
+            "id": 90,
+            "methods": [{"id": 10,
+                         "arguments": [],
+                         "name": "select",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "select-ok"},
+                        {"id": 20,
+                         "arguments": [],
+                         "name": "commit",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [],
+                         "name": "commit-ok"},
+                        {"id": 30,
+                         "arguments": [],
+                         "name": "rollback",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [],
+                         "name": "rollback-ok"}],
+            "name": "tx"
+        },
+        {
+            "id": 100,
+            "methods": [{"id": 10,
+                         "arguments": [],
+                         "name": "select",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "select-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "shortstr", "name": "dtx-identifier"}],
+                         "name": "start",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [], "name": "start-ok"}],
+            "name": "dtx"
+        },
+        {
+            "id": 110,
+            "methods": [{"content": true,
+                         "id": 10,
+                         "arguments": [{"type": "table", "name": "meta-data"}],
+                         "name": "request"}],
+            "name": "tunnel",
+            "properties": [{"type": "table", "name": "headers"},
+                           {"type": "shortstr", "name": "proxy-name"},
+                           {"type": "shortstr", "name": "data-name"},
+                           {"type": "octet", "name": "durable"},
+                           {"type": "octet", "name": "broadcast"}]
+        },
+        {
+            "id": 120,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "octet", "name": "integer-1"},
+                                       {"type": "short", "name": "integer-2"},
+                                       {"type": "long", "name": "integer-3"},
+                                       {"type": "longlong", "name": "integer-4"},
+                                       {"type": "octet", "name": "operation"}],
+                         "name": "integer",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [{"type": "longlong", "name": "result"}],
+                         "name": "integer-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "shortstr", "name": "string-1"},
+                                       {"type": "longstr", "name": "string-2"},
+                                       {"type": "octet", "name": "operation"}],
+                         "name": "string",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "longstr", "name": "result"}],
+                         "name": "string-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "table", "name": "table"},
+                                       {"type": "octet", "name": "integer-op"},
+                                       {"type": "octet", "name": "string-op"}],
+                         "name": "table",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "longlong", "name": "integer-result"},
+                                       {"type": "longstr", "name": "string-result"}],
+                         "name": "table-ok"},
+                        {"content": true,
+                         "id": 40,
+                         "arguments": [],
+                         "name": "content",
+                         "synchronous" : true},
+                        {"content": true,
+                         "id": 41,
+                         "arguments": [{"type": "long", "name": "content-checksum"}],
+                         "name": "content-ok"}],
+            "name": "test"
+        }
     ]
 }
diff --git a/amqp-rabbitmq-0.9.1.json b/amqp-rabbitmq-0.9.1.json
index 1697641..6704909 100644
--- a/amqp-rabbitmq-0.9.1.json
+++ b/amqp-rabbitmq-0.9.1.json
@@ -15,11 +15,11 @@
         "sublicense, and/or sell copies of the Software, and to permit \n",
         "persons to whom the Software is furnished to do so, subject to \n",
         "the following conditions:\n",
-	"\n",
-	"The above copyright notice and this permission notice shall be\n",
+        "\n",
+        "The above copyright notice and this permission notice shall be\n",
         "included in all copies or substantial portions of the Software.\n",
-	"\n",
-	"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n",
+        "\n",
+        "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n",
         "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\n",
         "OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n",
         "NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n",
@@ -27,432 +27,432 @@
         "WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n",
         "FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n",
         "OTHER DEALINGS IN THE SOFTWARE.\n",
-	"\n",
-	"Class information entered from amqp_xml0-8.pdf and domain types from amqp-xml-doc0-9.pdf\n",
-	"Updated for 0-9-1 by Tony Garnock-Jones\n",
-	"\n",
-	"b3cb053f15e7b98808c0ccc67f23cb3e  amqp_xml0-8.pdf\n",
+        "\n",
+        "Class information entered from amqp_xml0-8.pdf and domain types from amqp-xml-doc0-9.pdf\n",
+        "Updated for 0-9-1 by Tony Garnock-Jones\n",
+        "\n",
+        "b3cb053f15e7b98808c0ccc67f23cb3e  amqp_xml0-8.pdf\n",
         "http://www.twiststandards.org/index.php?option=com_docman&task=cat_view&gid=28&&Itemid=90\n",
         "8444db91e2949dbecfb2585e9eef6d64  amqp-xml-doc0-9.pdf\n",
         "https://jira.amqp.org/confluence/download/attachments/720900/amqp-xml-doc0-9.pdf?version=1\n"],
 
     "domains": [
-	["bit", "bit"],
-	["channel-id", "longstr"],
-	["class-id", "short"],
-	["consumer-tag", "shortstr"],
-	["delivery-tag", "longlong"],
-	["destination", "shortstr"],
-	["duration", "longlong"],
-	["exchange-name", "shortstr"],
-	["long", "long"],
-	["longlong", "longlong"],
-	["longstr", "longstr"],
-	["method-id", "short"],
-	["no-ack", "bit"],
-	["no-local", "bit"],
-	["octet", "octet"],
-	["offset", "longlong"],
-	["path", "shortstr"],
-	["peer-properties", "table"],
-	["queue-name", "shortstr"],
-	["redelivered", "bit"],
-	["reference", "longstr"],
-	["reject-code", "short"],
-	["reject-text", "shortstr"],
-	["reply-code", "short"],
-	["reply-text", "shortstr"],
-	["security-token", "longstr"],
-	["short", "short"],
-	["shortstr", "shortstr"],
-	["table", "table"],
-	["timestamp", "timestamp"]
+        ["bit", "bit"],
+        ["channel-id", "longstr"],
+        ["class-id", "short"],
+        ["consumer-tag", "shortstr"],
+        ["delivery-tag", "longlong"],
+        ["destination", "shortstr"],
+        ["duration", "longlong"],
+        ["exchange-name", "shortstr"],
+        ["long", "long"],
+        ["longlong", "longlong"],
+        ["longstr", "longstr"],
+        ["method-id", "short"],
+        ["no-ack", "bit"],
+        ["no-local", "bit"],
+        ["octet", "octet"],
+        ["offset", "longlong"],
+        ["path", "shortstr"],
+        ["peer-properties", "table"],
+        ["queue-name", "shortstr"],
+        ["redelivered", "bit"],
+        ["reference", "longstr"],
+        ["reject-code", "short"],
+        ["reject-text", "shortstr"],
+        ["reply-code", "short"],
+        ["reply-text", "shortstr"],
+        ["security-token", "longstr"],
+        ["short", "short"],
+        ["shortstr", "shortstr"],
+        ["table", "table"],
+        ["timestamp", "timestamp"]
     ],
 
     "constants": [
-	{"name": "FRAME-METHOD", "value": 1},
-	{"name": "FRAME-HEADER", "value": 2},
-	{"name": "FRAME-BODY", "value": 3},
-	{"name": "FRAME-HEARTBEAT", "value": 8},
-	{"name": "FRAME-MIN-SIZE", "value": 4096},
-	{"name": "FRAME-END", "value": 206},
-	{"name": "REPLY-SUCCESS", "value": 200},
-	{"name": "CONTENT-TOO-LARGE", "value": 311, "class": "soft-error"},
-	{"name": "NO-ROUTE", "value": 312, "class": "soft-error"},
-	{"name": "NO-CONSUMERS", "value": 313, "class": "soft-error"},
-	{"name": "ACCESS-REFUSED", "value": 403, "class": "soft-error"},
-	{"name": "NOT-FOUND", "value": 404, "class": "soft-error"},
-	{"name": "RESOURCE-LOCKED", "value": 405, "class": "soft-error"},
-	{"name": "PRECONDITION-FAILED", "value": 406, "class": "soft-error"},
-	{"name": "CONNECTION-FORCED", "value": 320, "class": "hard-error"},
-	{"name": "INVALID-PATH", "value": 402, "class": "hard-error"},
-	{"name": "FRAME-ERROR", "value": 501, "class": "hard-error"},
-	{"name": "SYNTAX-ERROR", "value": 502, "class": "hard-error"},
-	{"name": "COMMAND-INVALID", "value": 503, "class": "hard-error"},
-	{"name": "CHANNEL-ERROR", "value": 504, "class": "hard-error"},
-	{"name": "UNEXPECTED-FRAME", "value": 505, "class": "hard-error"},
-	{"name": "RESOURCE-ERROR", "value": 506, "class": "hard-error"},
-	{"name": "NOT-ALLOWED", "value": 530, "class": "hard-error"},
-	{"name": "NOT-IMPLEMENTED", "value": 540, "class": "hard-error"},
-	{"name": "INTERNAL-ERROR", "value": 541, "class": "hard-error"}
+        {"name": "FRAME-METHOD", "value": 1},
+        {"name": "FRAME-HEADER", "value": 2},
+        {"name": "FRAME-BODY", "value": 3},
+        {"name": "FRAME-HEARTBEAT", "value": 8},
+        {"name": "FRAME-MIN-SIZE", "value": 4096},
+        {"name": "FRAME-END", "value": 206},
+        {"name": "REPLY-SUCCESS", "value": 200},
+        {"name": "CONTENT-TOO-LARGE", "value": 311, "class": "soft-error"},
+        {"name": "NO-ROUTE", "value": 312, "class": "soft-error"},
+        {"name": "NO-CONSUMERS", "value": 313, "class": "soft-error"},
+        {"name": "ACCESS-REFUSED", "value": 403, "class": "soft-error"},
+        {"name": "NOT-FOUND", "value": 404, "class": "soft-error"},
+        {"name": "RESOURCE-LOCKED", "value": 405, "class": "soft-error"},
+        {"name": "PRECONDITION-FAILED", "value": 406, "class": "soft-error"},
+        {"name": "CONNECTION-FORCED", "value": 320, "class": "hard-error"},
+        {"name": "INVALID-PATH", "value": 402, "class": "hard-error"},
+        {"name": "FRAME-ERROR", "value": 501, "class": "hard-error"},
+        {"name": "SYNTAX-ERROR", "value": 502, "class": "hard-error"},
+        {"name": "COMMAND-INVALID", "value": 503, "class": "hard-error"},
+        {"name": "CHANNEL-ERROR", "value": 504, "class": "hard-error"},
+        {"name": "UNEXPECTED-FRAME", "value": 505, "class": "hard-error"},
+        {"name": "RESOURCE-ERROR", "value": 506, "class": "hard-error"},
+        {"name": "NOT-ALLOWED", "value": 530, "class": "hard-error"},
+        {"name": "NOT-IMPLEMENTED", "value": 540, "class": "hard-error"},
+        {"name": "INTERNAL-ERROR", "value": 541, "class": "hard-error"}
     ],
 
     "classes": [
-	{
-	    "id": 10,
-	    "methods": [{"id": 10,
+        {
+            "id": 10,
+            "methods": [{"id": 10,
                          "arguments": [{"type": "octet", "name": "version-major", "default-value": 0},
-				       {"type": "octet", "name": "version-minor", "default-value": 9},
-				       {"domain": "peer-properties", "name": "server properties"},
-				       {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"},
-				       {"type": "longstr", "name": "locales", "default-value": "en_US"}],
-			 "name": "start",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [{"domain": "peer-properties", "name": "client-properties"},
-				       {"type": "shortstr", "name": "mechanism", "default-value": "PLAIN"},
-				       {"type": "longstr", "name": "response"},
-				       {"type": "shortstr", "name": "locale", "default-value": "en_US"}],
-			 "name": "start-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "longstr", "name": "challenge"}],
-			 "name": "secure",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "longstr", "name": "response"}],
-			 "name": "secure-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
-				       {"type": "long", "name": "frame-max", "default-value": 0},
-				       {"type": "short", "name": "heartbeat", "default-value": 0}],
-			 "name": "tune",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
-				       {"type": "long", "name": "frame-max", "default-value": 0},
-				       {"type": "short", "name": "heartbeat", "default-value": 0}],
-			 "name": "tune-ok"},
-			{"id": 40,
-			 "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"},
-				       {"type": "shortstr", "name": "capabilities", "default-value": ""},
-				       {"type": "bit", "name": "insist", "default-value": false}],
-			 "name": "open",
-			 "synchronous" : true},
-			{"id": 41,
-			 "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}],
-			 "name": "open-ok"},
-			{"id": 50,
-			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "short", "name": "class-id"},
-				       {"type": "short", "name": "method-id"}],
-			 "name": "close",
-			 "synchronous" : true},
-			{"id": 51,
-			 "arguments": [],
-			 "name": "close-ok"}],
-	    "name": "connection",
-	    "properties": []
-	},
-	{
-	    "id": 20,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "shortstr", "name": "out-of-band", "default-value": ""}],
-			 "name": "open",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [{"type": "longstr", "name": "channel-id", "default-value": ""}],
-			 "name": "open-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "bit", "name": "active"}],
-			 "name": "flow",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "bit", "name": "active"}],
-			 "name": "flow-ok"},
-			{"id": 40,
-			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "short", "name": "class-id"},
-				       {"type": "short", "name": "method-id"}],
-			 "name": "close",
-			 "synchronous" : true},
-			{"id": 41,
-			 "arguments": [],
-			 "name": "close-ok"}],
-	    "name": "channel"
-	},
-	{
-	    "id": 30,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "shortstr", "name": "realm", "default-value": "/data"},
-				       {"type": "bit", "name": "exclusive", "default-value": false},
-				       {"type": "bit", "name": "passive", "default-value": true},
-				       {"type": "bit", "name": "active", "default-value": true},
-				       {"type": "bit", "name": "write", "default-value": true},
-				       {"type": "bit", "name": "read", "default-value": true}],
-			 "name": "request",
-			 "synchronous" : true},
-			{"id": 11,
+                                       {"type": "octet", "name": "version-minor", "default-value": 9},
+                                       {"domain": "peer-properties", "name": "server properties"},
+                                       {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"},
+                                       {"type": "longstr", "name": "locales", "default-value": "en_US"}],
+                         "name": "start",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [{"domain": "peer-properties", "name": "client-properties"},
+                                       {"type": "shortstr", "name": "mechanism", "default-value": "PLAIN"},
+                                       {"type": "longstr", "name": "response"},
+                                       {"type": "shortstr", "name": "locale", "default-value": "en_US"}],
+                         "name": "start-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "longstr", "name": "challenge"}],
+                         "name": "secure",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "longstr", "name": "response"}],
+                         "name": "secure-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
+                                       {"type": "long", "name": "frame-max", "default-value": 0},
+                                       {"type": "short", "name": "heartbeat", "default-value": 0}],
+                         "name": "tune",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
+                                       {"type": "long", "name": "frame-max", "default-value": 0},
+                                       {"type": "short", "name": "heartbeat", "default-value": 0}],
+                         "name": "tune-ok"},
+                        {"id": 40,
+                         "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"},
+                                       {"type": "shortstr", "name": "capabilities", "default-value": ""},
+                                       {"type": "bit", "name": "insist", "default-value": false}],
+                         "name": "open",
+                         "synchronous" : true},
+                        {"id": 41,
+                         "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}],
+                         "name": "open-ok"},
+                        {"id": 50,
+                         "arguments": [{"type": "short", "name": "reply-code"},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "short", "name": "class-id"},
+                                       {"type": "short", "name": "method-id"}],
+                         "name": "close",
+                         "synchronous" : true},
+                        {"id": 51,
+                         "arguments": [],
+                         "name": "close-ok"}],
+            "name": "connection",
+            "properties": []
+        },
+        {
+            "id": 20,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "shortstr", "name": "out-of-band", "default-value": ""}],
+                         "name": "open",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [{"type": "longstr", "name": "channel-id", "default-value": ""}],
+                         "name": "open-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "bit", "name": "active"}],
+                         "name": "flow",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "bit", "name": "active"}],
+                         "name": "flow-ok"},
+                        {"id": 40,
+                         "arguments": [{"type": "short", "name": "reply-code"},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "short", "name": "class-id"},
+                                       {"type": "short", "name": "method-id"}],
+                         "name": "close",
+                         "synchronous" : true},
+                        {"id": 41,
+                         "arguments": [],
+                         "name": "close-ok"}],
+            "name": "channel"
+        },
+        {
+            "id": 30,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "shortstr", "name": "realm", "default-value": "/data"},
+                                       {"type": "bit", "name": "exclusive", "default-value": false},
+                                       {"type": "bit", "name": "passive", "default-value": true},
+                                       {"type": "bit", "name": "active", "default-value": true},
+                                       {"type": "bit", "name": "write", "default-value": true},
+                                       {"type": "bit", "name": "read", "default-value": true}],
+                         "name": "request",
+                         "synchronous" : true},
+                        {"id": 11,
                     "arguments": [{"type": "short", "name": "ticket", "default-value": 1}],
-			 "name": "request-ok"}],
-	    "name": "access"
-	},
-	{
-	    "id": 40,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "type", "default-value": "direct"},
-				       {"type": "bit", "name": "passive", "default-value": false},
-				       {"type": "bit", "name": "durable", "default-value": false},
-				       {"type": "bit", "name": "auto-delete", "default-value": false},
-				       {"type": "bit", "name": "internal", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "declare",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "declare-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "bit", "name": "if-unused", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "delete",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [],
-			 "name": "delete-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "destination"},
-				       {"type": "shortstr", "name": "source"},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "bind",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [],
-			 "name": "bind-ok"},
-			{"id": 40,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "destination"},
-				       {"type": "shortstr", "name": "source"},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "unbind",
-			 "synchronous" : true},
-			{"id": 51,
-			 "arguments": [],
-			 "name": "unbind-ok"}],
-	    "name": "exchange"
-	},
-	{
-	    "id": 50,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                         "name": "request-ok"}],
+            "name": "access"
+        },
+        {
+            "id": 40,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "type", "default-value": "direct"},
+                                       {"type": "bit", "name": "passive", "default-value": false},
+                                       {"type": "bit", "name": "durable", "default-value": false},
+                                       {"type": "bit", "name": "auto-delete", "default-value": false},
+                                       {"type": "bit", "name": "internal", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "declare",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "declare-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "bit", "name": "if-unused", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "delete",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [],
+                         "name": "delete-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "destination"},
+                                       {"type": "shortstr", "name": "source"},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "bind",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [],
+                         "name": "bind-ok"},
+                        {"id": 40,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "destination"},
+                                       {"type": "shortstr", "name": "source"},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "unbind",
+                         "synchronous" : true},
+                        {"id": 51,
+                         "arguments": [],
+                         "name": "unbind-ok"}],
+            "name": "exchange"
+        },
+        {
+            "id": 50,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
                            {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "bit", "name": "passive", "default-value": false},
-				       {"type": "bit", "name": "durable", "default-value": false},
-				       {"type": "bit", "name": "exclusive", "default-value": false},
-				       {"type": "bit", "name": "auto-delete", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "declare",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [{"type": "shortstr", "name": "queue"},
-				       {"type": "long", "name": "message-count"},
-				       {"type": "long", "name": "consumer-count"}],
-			 "name": "declare-ok"},
-			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "bind",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [],
-			 "name": "bind-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "purge",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "long", "name": "message-count"}],
-			 "name": "purge-ok"},
-			{"id": 40,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "bit", "name": "if-unused", "default-value": false},
-				       {"type": "bit", "name": "if-empty", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "delete",
-			 "synchronous" : true},
-			{"id": 41,
-			 "arguments": [{"type": "long", "name": "message-count"}],
-			 "name": "delete-ok"},
-			{"id": 50,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "unbind",
-			 "synchronous" : true},
-			{"id": 51,
-			 "arguments": [],
-			 "name": "unbind-ok"}
-			],
-	    "name": "queue"
-	},
-	{
-	    "id": 60,
-	    "methods": [{"id": 10,
-			 "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
-				       {"type": "short", "name": "prefetch-count", "default-value": 0},
-				       {"type": "bit", "name": "global", "default-value": false}],
-			 "name": "qos",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "qos-ok"},
-			{"id": 20,
-			 "arguments": [{"domain": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
-				       {"type": "bit", "name": "no-local", "default-value": false},
-				       {"type": "bit", "name": "no-ack", "default-value": false},
-				       {"type": "bit", "name": "exclusive", "default-value": false},
-				       {"type": "bit", "name": "nowait", "default-value": false},
-				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "consume",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
-			 "name": "consume-ok"},
-			{"id": 30,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "cancel",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
-			 "name": "cancel-ok"},
-			{"content": true,
-			 "id": 40,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "exchange", "default-value": ""},
-				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
-				       {"type": "bit", "name": "mandatory", "default-value": false},
-				       {"type": "bit", "name": "immediate", "default-value": false}],
-			 "name": "publish"},
-			{"content": true,
-			 "id": 50,
-			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"}],
-			 "name": "return"},
-			{"content": true,
-			 "id": 60,
-			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "redelivered", "default-value": false},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"}],
-			 "name": "deliver"},
-			{"id": 70,
-			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
-				       {"type": "shortstr", "name": "queue", "default-value": ""},
-				       {"type": "bit", "name": "no-ack", "default-value": false}],
-			 "name": "get",
-			 "synchronous" : true},
-			{"content": true,
-			 "id": 71,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "redelivered", "default-value": false},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "long", "name": "message-count"}],
-			 "name": "get-ok"},
-			{"id": 72,
-			 "arguments": [{"type": "shortstr", "name": "cluster-id", "default-value": ""}],
-			 "name": "get-empty"},
-			{"id": 80,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
-				       {"type": "bit", "name": "multiple", "default-value": false}],
-			 "name": "ack"},
-			{"id": 90,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "requeue", "default-value": true}],
-			 "name": "reject"},
-			{"id": 100,
-			 "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
-			 "name": "recover-async"},
-			{"id": 110,
-			 "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
-			 "name": "recover",
-			 "synchronous" : true},
-			{"id": 111,
-			 "arguments": [],
-             "name": "recover-ok"},
-            {"id": 120,
-             "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
-                           {"type": "bit", "name": "multiple", "default-value": false},
-                       {"type": "bit", "name": "requeue", "default-value": true}],
-             "name": "nack"}],
-	    "name": "basic",
-	    "properties": [{"type": "shortstr", "name": "content-type"},
-			   {"type": "shortstr", "name": "content-encoding"},
-			   {"type": "table", "name": "headers"},
-			   {"type": "octet", "name": "delivery-mode"},
-			   {"type": "octet", "name": "priority"},
-			   {"type": "shortstr", "name": "correlation-id"},
-			   {"type": "shortstr", "name": "reply-to"},
-			   {"type": "shortstr", "name": "expiration"},
-			   {"type": "shortstr", "name": "message-id"},
-			   {"type": "timestamp", "name": "timestamp"},
-			   {"type": "shortstr", "name": "type"},
-			   {"type": "shortstr", "name": "user-id"},
-			   {"type": "shortstr", "name": "app-id"},
-			   {"type": "shortstr", "name": "cluster-id"}]
-	},
-	{
-	    "id": 90,
-	    "methods": [{"id": 10,
-			 "arguments": [],
-			 "name": "select",
-			 "synchronous" : true},
-			{"id": 11,
-			 "arguments": [],
-			 "name": "select-ok"},
-			{"id": 20,
-			 "arguments": [],
-			 "name": "commit",
-			 "synchronous" : true},
-			{"id": 21,
-			 "arguments": [],
-			 "name": "commit-ok"},
-			{"id": 30,
-			 "arguments": [],
-			 "name": "rollback",
-			 "synchronous" : true},
-			{"id": 31,
-			 "arguments": [],
-			 "name": "rollback-ok"}],
-	    "name": "tx"
-	},
-    	{
+                                       {"type": "bit", "name": "passive", "default-value": false},
+                                       {"type": "bit", "name": "durable", "default-value": false},
+                                       {"type": "bit", "name": "exclusive", "default-value": false},
+                                       {"type": "bit", "name": "auto-delete", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "declare",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [{"type": "shortstr", "name": "queue"},
+                                       {"type": "long", "name": "message-count"},
+                                       {"type": "long", "name": "consumer-count"}],
+                         "name": "declare-ok"},
+                        {"id": 20,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "bind",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [],
+                         "name": "bind-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "purge",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "long", "name": "message-count"}],
+                         "name": "purge-ok"},
+                        {"id": 40,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "bit", "name": "if-unused", "default-value": false},
+                                       {"type": "bit", "name": "if-empty", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "delete",
+                         "synchronous" : true},
+                        {"id": 41,
+                         "arguments": [{"type": "long", "name": "message-count"}],
+                         "name": "delete-ok"},
+                        {"id": 50,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "unbind",
+                         "synchronous" : true},
+                        {"id": 51,
+                         "arguments": [],
+                         "name": "unbind-ok"}
+                        ],
+            "name": "queue"
+        },
+        {
+            "id": 60,
+            "methods": [{"id": 10,
+                         "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
+                                       {"type": "short", "name": "prefetch-count", "default-value": 0},
+                                       {"type": "bit", "name": "global", "default-value": false}],
+                         "name": "qos",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "qos-ok"},
+                        {"id": 20,
+                         "arguments": [{"domain": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
+                                       {"type": "bit", "name": "no-local", "default-value": false},
+                                       {"type": "bit", "name": "no-ack", "default-value": false},
+                                       {"type": "bit", "name": "exclusive", "default-value": false},
+                                       {"type": "bit", "name": "nowait", "default-value": false},
+                                       {"type": "table", "name": "arguments", "default-value": {}}],
+                         "name": "consume",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
+                         "name": "consume-ok"},
+                        {"id": 30,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"},
+                                       {"type": "bit", "name": "nowait", "default-value": false}],
+                         "name": "cancel",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
+                         "name": "cancel-ok"},
+                        {"content": true,
+                         "id": 40,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "exchange", "default-value": ""},
+                                       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+                                       {"type": "bit", "name": "mandatory", "default-value": false},
+                                       {"type": "bit", "name": "immediate", "default-value": false}],
+                         "name": "publish"},
+                        {"content": true,
+                         "id": 50,
+                         "arguments": [{"type": "short", "name": "reply-code"},
+                                       {"type": "shortstr", "name": "reply-text", "default-value": ""},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"}],
+                         "name": "return"},
+                        {"content": true,
+                         "id": 60,
+                         "arguments": [{"type": "shortstr", "name": "consumer-tag"},
+                                       {"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "bit", "name": "redelivered", "default-value": false},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"}],
+                         "name": "deliver"},
+                        {"id": 70,
+                         "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
+                                       {"type": "shortstr", "name": "queue", "default-value": ""},
+                                       {"type": "bit", "name": "no-ack", "default-value": false}],
+                         "name": "get",
+                         "synchronous" : true},
+                        {"content": true,
+                         "id": 71,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "bit", "name": "redelivered", "default-value": false},
+                                       {"type": "shortstr", "name": "exchange"},
+                                       {"type": "shortstr", "name": "routing-key"},
+                                       {"type": "long", "name": "message-count"}],
+                         "name": "get-ok"},
+                        {"id": 72,
+                         "arguments": [{"type": "shortstr", "name": "cluster-id", "default-value": ""}],
+                         "name": "get-empty"},
+                        {"id": 80,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
+                                       {"type": "bit", "name": "multiple", "default-value": false}],
+                         "name": "ack"},
+                        {"id": 90,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag"},
+                                       {"type": "bit", "name": "requeue", "default-value": true}],
+                         "name": "reject"},
+                        {"id": 100,
+                         "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
+                         "name": "recover-async"},
+                        {"id": 110,
+                         "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
+                         "name": "recover",
+                         "synchronous" : true},
+                        {"id": 111,
+                         "arguments": [],
+                         "name": "recover-ok"},
+                        {"id": 120,
+                         "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
+                                       {"type": "bit", "name": "multiple", "default-value": false},
+                                       {"type": "bit", "name": "requeue", "default-value": true}],
+                         "name": "nack"}],
+            "name": "basic",
+            "properties": [{"type": "shortstr", "name": "content-type"},
+                           {"type": "shortstr", "name": "content-encoding"},
+                           {"type": "table", "name": "headers"},
+                           {"type": "octet", "name": "delivery-mode"},
+                           {"type": "octet", "name": "priority"},
+                           {"type": "shortstr", "name": "correlation-id"},
+                           {"type": "shortstr", "name": "reply-to"},
+                           {"type": "shortstr", "name": "expiration"},
+                           {"type": "shortstr", "name": "message-id"},
+                           {"type": "timestamp", "name": "timestamp"},
+                           {"type": "shortstr", "name": "type"},
+                           {"type": "shortstr", "name": "user-id"},
+                           {"type": "shortstr", "name": "app-id"},
+                           {"type": "shortstr", "name": "cluster-id"}]
+        },
+        {
+            "id": 90,
+            "methods": [{"id": 10,
+                         "arguments": [],
+                         "name": "select",
+                         "synchronous" : true},
+                        {"id": 11,
+                         "arguments": [],
+                         "name": "select-ok"},
+                        {"id": 20,
+                         "arguments": [],
+                         "name": "commit",
+                         "synchronous" : true},
+                        {"id": 21,
+                         "arguments": [],
+                         "name": "commit-ok"},
+                        {"id": 30,
+                         "arguments": [],
+                         "name": "rollback",
+                         "synchronous" : true},
+                        {"id": 31,
+                         "arguments": [],
+                         "name": "rollback-ok"}],
+            "name": "tx"
+        },
+        {
             "id": 85,
             "methods": [{"id": 10,
                          "arguments": [
diff --git a/amqp_codegen.py b/amqp_codegen.py
index a10cc6d..c6c6a5f 100644
--- a/amqp_codegen.py
+++ b/amqp_codegen.py
@@ -32,7 +32,7 @@
 from __future__ import nested_scopes
 import re
 import sys
-from os import remove
+import os
 from optparse import OptionParser
 
 try:
@@ -172,7 +172,7 @@ class AmqpSpec:
 
         self.classes = []
         for element in self.spec['classes']:
-            self.classes.append(AmqpClass(self.spec, element))
+            self.classes.append(AmqpClass(self, element))
         
     def allClasses(self):
         return self.classes
@@ -271,16 +271,16 @@ def do_main_dict(funcDict):
     def execute(fn, amqp_specs, out_file):
         stdout = sys.stdout
         f = open(out_file, 'w')
+        success = False
         try:
-            try:
-                sys.stdout = f
-                fn(amqp_specs)
-            except:
-                remove(out_file)
-                raise
+            sys.stdout = f
+            fn(amqp_specs)
+            success = True
         finally:
             sys.stdout = stdout
             f.close()
+            if not success:
+                os.remove(out_file)
 
     parser = OptionParser()
     parser.add_option("--ignore-conflicts", action="store_true", dest="ignore_conflicts", default=False)