diff --git a/deps/rabbitmq_codegen/amqp-0.8.json b/deps/rabbitmq_codegen/amqp-0.8.json
index ae955dea93..da67bfdf98 100644
--- a/deps/rabbitmq_codegen/amqp-0.8.json
+++ b/deps/rabbitmq_codegen/amqp-0.8.json
@@ -106,17 +106,17 @@
 	{
 	    "id": 10,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "octet", "name": "version-major"},
-				       {"type": "octet", "name": "version-minor"},
+                         "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"},
-				       {"type": "longstr", "name": "locales"}],
+				       {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"},
+				       {"type": "longstr", "name": "locales", "default-value": "en_US"}],
 			 "name": "start"},
 			{"id": 11,
 			 "arguments": [{"domain": "peer-properties", "name": "client-properties"},
-				       {"type": "shortstr", "name": "mechanism"},
+				       {"type": "shortstr", "name": "mechanism", "default-value": "PLAIN"},
 				       {"type": "longstr", "name": "response"},
-				       {"type": "shortstr", "name": "locale"}],
+				       {"type": "shortstr", "name": "locale", "default-value": "en_US"}],
 			 "name": "start-ok"},
 			{"id": 20,
 			 "arguments": [{"type": "longstr", "name": "challenge"}],
@@ -125,30 +125,30 @@
 			 "arguments": [{"type": "longstr", "name": "response"}],
 			 "name": "secure-ok"},
 			{"id": 30,
-			 "arguments": [{"type": "short", "name": "channel-max"},
-				       {"type": "long", "name": "frame-max"},
-				       {"type": "short", "name": "heartbeat"}],
+			 "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"},
 			{"id": 31,
-			 "arguments": [{"type": "short", "name": "channel-max"},
-				       {"type": "long", "name": "frame-max"},
-				       {"type": "short", "name": "heartbeat"}],
+			 "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"},
-				       {"type": "shortstr", "name": "capabilities"},
-				       {"type": "bit", "name": "insist"}],
+			 "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"},
+				       {"type": "shortstr", "name": "capabilities", "default-value": ""},
+				       {"type": "bit", "name": "insist", "default-value": false}],
 			 "name": "open"},
 			{"id": 41,
-			 "arguments": [{"type": "shortstr", "name": "known-hosts"}],
+			 "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}],
 			 "name": "open-ok"},
 			{"id": 50,
 			 "arguments": [{"type": "shortstr", "name": "host"},
-				       {"type": "shortstr", "name": "known-hosts"}],
+				       {"type": "shortstr", "name": "known-hosts", "default-value": ""}],
 			 "name": "redirect"},
 			{"id": 60,
 			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text"},
+				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
 				       {"type": "short", "name": "class-id"},
 				       {"type": "short", "name": "method-id"}],
 			 "name": "close"},
@@ -161,7 +161,7 @@
 	{
 	    "id": 20,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "shortstr", "name": "out-of-band"}],
+			 "arguments": [{"type": "shortstr", "name": "out-of-band", "default-value": ""}],
 			 "name": "open"},
 			{"id": 11,
 			 "arguments": [],
@@ -174,12 +174,12 @@
 			 "name": "flow-ok"},
 			{"id": 30,
 			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text"},
-				       {"type": "table", "name": "details"}],
+				       {"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"},
+				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
 				       {"type": "short", "name": "class-id"},
 				       {"type": "short", "name": "method-id"}],
 			 "name": "close"},
@@ -191,39 +191,39 @@
 	{
 	    "id": 30,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "shortstr", "name": "realm"},
-				       {"type": "bit", "name": "exclusive"},
-				       {"type": "bit", "name": "passive"},
-				       {"type": "bit", "name": "active"},
-				       {"type": "bit", "name": "write"},
-				       {"type": "bit", "name": "read"}],
+			 "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"},
 			{"id": 11,
-			 "arguments": [{"type": "short", "name": "ticket"}],
+                    "arguments": [{"type": "short", "name": "ticket", "default-value": 1}],
 			 "name": "request-ok"}],
 	    "name": "access"
 	},
 	{
 	    "id": 40,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "ticket"},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "type"},
-				       {"type": "bit", "name": "passive"},
-				       {"type": "bit", "name": "durable"},
-				       {"type": "bit", "name": "auto-delete"},
-				       {"type": "bit", "name": "internal"},
-				       {"type": "bit", "name": "nowait"},
-				       {"type": "table", "name": "arguments"}],
+				       {"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"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "declare-ok"},
 			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket"},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "bit", "name": "if-unused"},
-				       {"type": "bit", "name": "nowait"}],
+				       {"type": "bit", "name": "if-unused", "default-value": false},
+				       {"type": "bit", "name": "nowait", "default-value": false}],
 			 "name": "delete"},
 			{"id": 21,
 			 "arguments": [],
@@ -233,45 +233,45 @@
 	{
 	    "id": 50,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "queue"},
-				       {"type": "bit", "name": "passive"},
-				       {"type": "bit", "name": "durable"},
-				       {"type": "bit", "name": "exclusive"},
-				       {"type": "bit", "name": "auto-delete"},
-				       {"type": "bit", "name": "nowait"},
-				       {"type": "table", "name": "arguments"}],
+			 "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"},
 			{"id": 11,
-			 "arguments": [{"type": "shortstr", "name": "queue"},
+			 "arguments": [{"type": "shortstr", "name": "queue", "default-value": ""},
 				       {"type": "long", "name": "message-count"},
 				       {"type": "long", "name": "consumer-count"}],
 			 "name": "declare-ok"},
 			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "queue"},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "bit", "name": "nowait"},
-				       {"type": "table", "name": "arguments"}],
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+				       {"type": "shortstr", "name": "queue", "default-value": ""},
+				       {"type": "shortstr", "name": "exchange", "default-value": ""},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+				       {"type": "bit", "name": "nowait", "default-value": false},
+				       {"type": "table", "name": "arguments", "default-value": {}}],
 			 "name": "bind"},
 			{"id": 21,
 			 "arguments": [],
 			 "name": "bind-ok"},
 			{"id": 30,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "queue"},
-				       {"type": "bit", "name": "nowait"}],
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+				       {"type": "shortstr", "name": "queue", "default-value": ""},
+				       {"type": "bit", "name": "nowait", "default-value": false}],
 			 "name": "purge"},
 			{"id": 31,
 			 "arguments": [{"type": "long", "name": "message-count"}],
 			 "name": "purge-ok"},
 			{"id": 40,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "queue"},
-				       {"type": "bit", "name": "if-unused"},
-				       {"type": "bit", "name": "if-empty"},
-				       {"type": "bit", "name": "nowait"}],
+			 "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"},
 			{"id": 41,
 			 "arguments": [{"type": "long", "name": "message-count"}],
@@ -281,44 +281,44 @@
 	{
 	    "id": 60,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "long", "name": "prefetch-size"},
-				       {"type": "short", "name": "prefetch-count"},
-				       {"type": "bit", "name": "global"}],
+			 "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"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "qos-ok"},
 			{"id": 20,
 			 "arguments": [{"domain": "access-ticket", "name": "ticket"},
-				       {"domain": "queue-name", "name": "queue"},
+				       {"domain": "queue-name", "name": "queue", "default-value": ""},
 				       {"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "no-local"},
-				       {"type": "bit", "name": "no-ack"},
-				       {"type": "bit", "name": "exclusive"},
-				       {"type": "bit", "name": "nowait"}],
+				       {"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"},
 			{"id": 21,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "consume-ok"},
 			{"id": 30,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "nowait"}],
+				       {"type": "bit", "name": "nowait", "default-value": false}],
 			 "name": "cancel"},
 			{"id": 31,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "cancel-ok"},
 			{"content": true,
 			 "id": 40,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "bit", "name": "mandatory"},
-				       {"type": "bit", "name": "immediate"}],
+			 "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"},
+			 "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"},
@@ -326,36 +326,36 @@
 			 "id": 60,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
 				       {"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "redelivered"},
+				       {"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"},
-				       {"type": "shortstr", "name": "queue"},
-				       {"type": "bit", "name": "no-ack"}],
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+				       {"type": "shortstr", "name": "queue", "default-value": ""},
+				       {"type": "bit", "name": "no-ack", "default-value": false}],
 			 "name": "get"},
 			{"content": true,
 			 "id": 71,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "redelivered"},
+				       {"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"}],
+			 "arguments": [{"type": "shortstr", "name": "cluster-id", "default-value": ""}],
 			 "name": "get-empty"},
 			{"id": 80,
-			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "multiple"}],
+			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
+				       {"type": "bit", "name": "multiple", "default-value": true}],
 			 "name": "ack"},
 			{"id": 90,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "requeue"}],
+				       {"type": "bit", "name": "requeue", "default-value": false}],
 			 "name": "reject"},
 			{"id": 100,
-			 "arguments": [{"type": "bit", "name": "requeue"}],
+			 "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
 			 "name": "recover"}],
 	    "name": "basic",
 	    "properties": [{"type": "shortstr", "name": "content-type"},
@@ -376,28 +376,28 @@
 	{
 	    "id": 70,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "long", "name": "prefetch-size"},
-				       {"type": "short", "name": "prefetch-count"},
-				       {"type": "bit", "name": "global"}],
+			 "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"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "qos-ok"},
 			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "queue"},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+				       {"type": "shortstr", "name": "queue", "default-value": ""},
 				       {"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "no-local"},
-				       {"type": "bit", "name": "no-ack"},
-				       {"type": "bit", "name": "exclusive"},
-				       {"type": "bit", "name": "nowait"}],
+				       {"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"},
 			{"id": 21,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "consume-ok"},
 			{"id": 30,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "nowait"}],
+				       {"type": "bit", "name": "nowait", "default-value": false}],
 			 "name": "cancel"},
 			{"id": 31,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
@@ -414,35 +414,35 @@
 			 "arguments": [],
 			 "name": "stage"},
 			{"id": 60,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "bit", "name": "mandatory"},
-				       {"type": "bit", "name": "immediate"},
+			 "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"},
-				       {"type": "shortstr", "name": "reply-text"},
+			 "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"},
+				       {"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"},
-				       {"type": "bit", "name": "multiple"}],
+			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
+                           {"type": "bit", "name": "multiple", "default-value": true}],
 			 "name": "ack"},
 			{"id": 100,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
-				       {"type": "bit", "name": "requeue"}],
+				       {"type": "bit", "name": "requeue", "default-value": false}],
 			 "name": "reject"}],
 	    "name": "file",
 	    "properties": [{"type": "shortstr", "name": "content-type"},
@@ -458,44 +458,44 @@
 	{
 	    "id": 80,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "long", "name": "prefetch-size"},
-				       {"type": "short", "name": "prefetch-count"},
-				       {"type": "long", "name": "consume-rate"},
-				       {"type": "bit", "name": "global"}],
+			 "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"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "qos-ok"},
 			{"id": 20,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "queue"},
-				       {"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "no-local"},
-				       {"type": "bit", "name": "exclusive"},
-				       {"type": "bit", "name": "nowait"}],
+			 "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"},
 			{"id": 21,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "consume-ok"},
 			{"id": 30,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
-				       {"type": "bit", "name": "nowait"}],
+				       {"type": "bit", "name": "nowait", "default-value": false}],
 			 "name": "cancel"},
 			{"id": 31,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "cancel-ok"},
 			{"content": true,
 			 "id": 40,
-			 "arguments": [{"type": "short", "name": "ticket"},
-				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "bit", "name": "mandatory"},
-				       {"type": "bit", "name": "immediate"}],
+			 "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"},
+			 "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"},
@@ -504,7 +504,7 @@
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
 				       {"type": "longlong", "name": "delivery-tag"},
 				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "queue"}],
+				       {"type": "shortstr", "name": "queue", "default-value": ""}],
 			 "name": "deliver"}],
 	    "name": "stream",
 	    "properties": [{"type": "shortstr", "name": "content-type"},
diff --git a/deps/rabbitmq_codegen/amqp_codegen.py b/deps/rabbitmq_codegen/amqp_codegen.py
index 71c08014c6..0bbb0bc792 100644
--- a/deps/rabbitmq_codegen/amqp_codegen.py
+++ b/deps/rabbitmq_codegen/amqp_codegen.py
@@ -133,6 +133,11 @@ class AmqpField(AmqpEntity):
             self.domain = self.element['type']
         else:
             self.domain = self.element['domain']
+            
+        if self.element.has_key('default-value'):
+            self.defaultvalue = self.element['default-value']
+        else:
+            self.defaultvalue = None
 
     def __repr__(self):
         return 'AmqpField("' + self.name + '")'