diff --git a/example/amd/js/libs/postal/postal.js b/example/amd/js/libs/postal/postal.js
index 6f347ec..c2e46ad 100644
--- a/example/amd/js/libs/postal/postal.js
+++ b/example/amd/js/libs/postal/postal.js
@@ -315,15 +315,15 @@ var postal = {
 	},
 
 	channel: function(exchange, topic) {
-		var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 2 ? topic : exchange;
+		var exch = topic ? exchange : DEFAULT_EXCHANGE,
+			tpc = topic || exchange;
 		return new ChannelDefinition(exch, tpc);
 	},
 
 	subscribe: function(exchange, topic, callback) {
-		var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 3 ? topic : exchange,
-			callbk  = arguments.length === 3 ? callback : topic;
+		var callbk = callback || topic,
+			tpc = callback ? topic : exchange,
+			exch = callback ? exchange : DEFAULT_EXCHANGE;
 		var channel = this.channel(exch, tpc);
 		return channel.subscribe(callbk);
 	},
diff --git a/example/standard/js/postal.js b/example/standard/js/postal.js
index 28ec438..4fc5ba3 100644
--- a/example/standard/js/postal.js
+++ b/example/standard/js/postal.js
@@ -315,15 +315,15 @@ var postal = {
 	},
 
 	channel: function(exchange, topic) {
-		var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 2 ? topic : exchange;
+		var exch = topic ? exchange : DEFAULT_EXCHANGE,
+			tpc = topic || exchange;
 		return new ChannelDefinition(exch, tpc);
 	},
 
 	subscribe: function(exchange, topic, callback) {
-		var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 3 ? topic : exchange,
-			callbk  = arguments.length === 3 ? callback : topic;
+		var callbk = callback || topic,
+			tpc = callback ? topic : exchange,
+			exch = callback ? exchange : DEFAULT_EXCHANGE;
 		var channel = this.channel(exch, tpc);
 		return channel.subscribe(callbk);
 	},
diff --git a/lib/browser/amd/postal.diagnostics.min.gz.js b/lib/browser/amd/postal.diagnostics.min.gz.js
index e966d3c..a1b9e18 100644
Binary files a/lib/browser/amd/postal.diagnostics.min.gz.js and b/lib/browser/amd/postal.diagnostics.min.gz.js differ
diff --git a/lib/browser/amd/postal.js b/lib/browser/amd/postal.js
index 6f347ec..c2e46ad 100644
--- a/lib/browser/amd/postal.js
+++ b/lib/browser/amd/postal.js
@@ -315,15 +315,15 @@ var postal = {
 	},
 
 	channel: function(exchange, topic) {
-		var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 2 ? topic : exchange;
+		var exch = topic ? exchange : DEFAULT_EXCHANGE,
+			tpc = topic || exchange;
 		return new ChannelDefinition(exch, tpc);
 	},
 
 	subscribe: function(exchange, topic, callback) {
-		var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 3 ? topic : exchange,
-			callbk  = arguments.length === 3 ? callback : topic;
+		var callbk = callback || topic,
+			tpc = callback ? topic : exchange,
+			exch = callback ? exchange : DEFAULT_EXCHANGE;
 		var channel = this.channel(exch, tpc);
 		return channel.subscribe(callbk);
 	},
diff --git a/lib/browser/amd/postal.min.gz.js b/lib/browser/amd/postal.min.gz.js
index a30da79..6d503d2 100644
Binary files a/lib/browser/amd/postal.min.gz.js and b/lib/browser/amd/postal.min.gz.js differ
diff --git a/lib/browser/amd/postal.min.js b/lib/browser/amd/postal.min.js
index 326256a..0059a3e 100644
--- a/lib/browser/amd/postal.min.js
+++ b/lib/browser/amd/postal.min.js
@@ -1 +1 @@
-define(["underscore"],function(a){var b="/",c=50,d=0,e="postal",f=function(){},g=function(c){var d={envelope:{}},e;switch(c.length){case 3:typeof c[1]=="Object"&&typeof c[2]=="Object"?(d.envelope.exchange=b,d.envelope.topic=c[0],d.payload=c[1],e=d.envelope,d.envelope=a.extend(e,c[2])):(d.envelope.exchange=c[0],d.envelope.topic=c[1],d.payload=c[2]);break;case 4:d.envelope.exchange=c[0],d.envelope.topic=c[1],d.payload=c[2],e=d.envelope,d.envelope=a.extend(e,c[3]);break;default:d.envelope.exchange=b,d.envelope.topic=c[0],d.payload=c[1]}return d},h=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},i=function(a,b){this.exchange=a,this.topic=b};i.prototype={subscribe:function(a){var b=new j(this.exchange,this.topic,a);return m.configuration.bus.subscribe(b),b},publish:function(b,c){var d=a.extend({exchange:this.exchange,timeStamp:new Date,topic:this.topic},c);m.configuration.bus.publish(b,d)}};var j=function(a,b,g){this.exchange=a,this.topic=b,this.callback=g,this.priority=c,this.constraints=[],this.maxCalls=d,this.onHandled=f,this.context=null,m.publish(e,"subscription.created",{event:"subscription.created",exchange:a,topic:b})};j.prototype={unsubscribe:function(){m.configuration.bus.unsubscribe(this),m.publish(e,"subscription.removed",{event:"subscription.removed",exchange:this.exchange,topic:this.topic})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new h),this},whenHandledThenExecute:function(b){if(!a.isFunction(b))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=b,this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(c,b,a)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this}};var k={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+this.regexify(a)+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d},regexify:function(a){return a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")}},l={subscriptions:{},wireTaps:[],publish:function(b,c){this.notifyTaps(b,c),a.each(this.subscriptions[c.exchange],function(d){a.each(d,function(d){m.configuration.resolver.compare(d.topic,c.topic)&&a.all(d.constraints,function(a){return a(b)})&&typeof d.callback=="function"&&(d.callback.apply(d.context,[b,c]),d.onHandled())})})},subscribe:function(a){var b,c,d,e,f;e=this.subscriptions[a.exchange]=this.subscriptions[a.exchange]||{},f=this.subscriptions[a.exchange][a.topic]=this.subscriptions[a.exchange][a.topic]||[],b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}c||f.unshift(a)},notifyTaps:function(b,c){a.each(this.wireTaps,function(a){a(b,c)})},unsubscribe:function(a){if(this.subscriptions[a.exchange][a.topic]){var b=this.subscriptions[a.exchange][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.exchange][a.topic][c]===a){this.subscriptions[a.exchange][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},m={configuration:{bus:l,resolver:k},channel:function(a,c){var d=arguments.length===2?a:b,e=arguments.length===2?c:a;return new i(d,e)},subscribe:function(a,c,d){var e=arguments.length===3?a:b,f=arguments.length===3?c:a,g=arguments.length===3?d:c,h=this.channel(e,f);return h.subscribe(g)},publish:function(a,b,c,d){var e=g([].slice.call(arguments,0)),f=this.channel(e.envelope.exchange,e.envelope.topic);f.publish(e.payload,e.envelope)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},bindExchanges:function(c,d){var e=[];return a.isArray(c)||(c=[c]),a.isArray(d)||(d=[d]),a.each(c,function(c){var f=c.topic||"*";a.each(d,function(d){var f=d.exchange||b;e.push(m.subscribe(c.exchange||b,c.topic||"*",function(b,c){var e=a.isFunction(d.topic)?d.topic(c.topic):d.topic||c.topic;m.publish(f,e,b)}))})}),e}};return m})
\ No newline at end of file
+define(["underscore"],function(a){var b="/",c=50,d=0,e="postal",f=function(){},g=function(c){var d={envelope:{}},e;switch(c.length){case 3:typeof c[1]=="Object"&&typeof c[2]=="Object"?(d.envelope.exchange=b,d.envelope.topic=c[0],d.payload=c[1],e=d.envelope,d.envelope=a.extend(e,c[2])):(d.envelope.exchange=c[0],d.envelope.topic=c[1],d.payload=c[2]);break;case 4:d.envelope.exchange=c[0],d.envelope.topic=c[1],d.payload=c[2],e=d.envelope,d.envelope=a.extend(e,c[3]);break;default:d.envelope.exchange=b,d.envelope.topic=c[0],d.payload=c[1]}return d},h=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},i=function(a,b){this.exchange=a,this.topic=b};i.prototype={subscribe:function(a){var b=new j(this.exchange,this.topic,a);return m.configuration.bus.subscribe(b),b},publish:function(b,c){var d=a.extend({exchange:this.exchange,timeStamp:new Date,topic:this.topic},c);m.configuration.bus.publish(b,d)}};var j=function(a,b,g){this.exchange=a,this.topic=b,this.callback=g,this.priority=c,this.constraints=[],this.maxCalls=d,this.onHandled=f,this.context=null,m.publish(e,"subscription.created",{event:"subscription.created",exchange:a,topic:b})};j.prototype={unsubscribe:function(){m.configuration.bus.unsubscribe(this),m.publish(e,"subscription.removed",{event:"subscription.removed",exchange:this.exchange,topic:this.topic})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new h),this},whenHandledThenExecute:function(b){if(!a.isFunction(b))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=b,this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(c,b,a)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this}};var k={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+this.regexify(a)+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d},regexify:function(a){return a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")}},l={subscriptions:{},wireTaps:[],publish:function(b,c){this.notifyTaps(b,c),a.each(this.subscriptions[c.exchange],function(d){a.each(d,function(d){m.configuration.resolver.compare(d.topic,c.topic)&&a.all(d.constraints,function(a){return a(b)})&&typeof d.callback=="function"&&(d.callback.apply(d.context,[b,c]),d.onHandled())})})},subscribe:function(a){var b,c,d,e,f;e=this.subscriptions[a.exchange]=this.subscriptions[a.exchange]||{},f=this.subscriptions[a.exchange][a.topic]=this.subscriptions[a.exchange][a.topic]||[],b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}c||f.unshift(a)},notifyTaps:function(b,c){a.each(this.wireTaps,function(a){a(b,c)})},unsubscribe:function(a){if(this.subscriptions[a.exchange][a.topic]){var b=this.subscriptions[a.exchange][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.exchange][a.topic][c]===a){this.subscriptions[a.exchange][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},m={configuration:{bus:l,resolver:k},channel:function(a,c){var d=c?a:b,e=c||a;return new i(d,e)},subscribe:function(a,c,d){var e=d||c,f=d?c:a,g=d?a:b,h=this.channel(g,f);return h.subscribe(e)},publish:function(a,b,c,d){var e=g([].slice.call(arguments,0)),f=this.channel(e.envelope.exchange,e.envelope.topic);f.publish(e.payload,e.envelope)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},bindExchanges:function(c,d){var e=[];return a.isArray(c)||(c=[c]),a.isArray(d)||(d=[d]),a.each(c,function(c){var f=c.topic||"*";a.each(d,function(d){var f=d.exchange||b;e.push(m.subscribe(c.exchange||b,c.topic||"*",function(b,c){var e=a.isFunction(d.topic)?d.topic(c.topic):d.topic||c.topic;m.publish(f,e,b)}))})}),e}};return m})
\ No newline at end of file
diff --git a/lib/browser/standard/postal.diagnostics.min.gz.js b/lib/browser/standard/postal.diagnostics.min.gz.js
index dd04952..5ff2ec4 100644
Binary files a/lib/browser/standard/postal.diagnostics.min.gz.js and b/lib/browser/standard/postal.diagnostics.min.gz.js differ
diff --git a/lib/browser/standard/postal.js b/lib/browser/standard/postal.js
index 28ec438..4fc5ba3 100644
--- a/lib/browser/standard/postal.js
+++ b/lib/browser/standard/postal.js
@@ -315,15 +315,15 @@ var postal = {
 	},
 
 	channel: function(exchange, topic) {
-		var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 2 ? topic : exchange;
+		var exch = topic ? exchange : DEFAULT_EXCHANGE,
+			tpc = topic || exchange;
 		return new ChannelDefinition(exch, tpc);
 	},
 
 	subscribe: function(exchange, topic, callback) {
-		var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 3 ? topic : exchange,
-			callbk  = arguments.length === 3 ? callback : topic;
+		var callbk = callback || topic,
+			tpc = callback ? topic : exchange,
+			exch = callback ? exchange : DEFAULT_EXCHANGE;
 		var channel = this.channel(exch, tpc);
 		return channel.subscribe(callbk);
 	},
diff --git a/lib/browser/standard/postal.min.gz.js b/lib/browser/standard/postal.min.gz.js
index c279a04..e82d604 100644
Binary files a/lib/browser/standard/postal.min.gz.js and b/lib/browser/standard/postal.min.gz.js differ
diff --git a/lib/browser/standard/postal.min.js b/lib/browser/standard/postal.min.js
index b068918..de9c0f8 100644
--- a/lib/browser/standard/postal.min.js
+++ b/lib/browser/standard/postal.min.js
@@ -1 +1 @@
-(function(a,b){var c="/",d=50,e=0,f="postal",g=function(){},h=function(a){var b={envelope:{}},d;switch(a.length){case 3:typeof a[1]=="Object"&&typeof a[2]=="Object"?(b.envelope.exchange=c,b.envelope.topic=a[0],b.payload=a[1],d=b.envelope,b.envelope=_.extend(d,a[2])):(b.envelope.exchange=a[0],b.envelope.topic=a[1],b.payload=a[2]);break;case 4:b.envelope.exchange=a[0],b.envelope.topic=a[1],b.payload=a[2],d=b.envelope,b.envelope=_.extend(d,a[3]);break;default:b.envelope.exchange=c,b.envelope.topic=a[0],b.payload=a[1]}return b},i=function(){var a;return function(b){var c=!1;return _.isString(b)?(c=b===a,a=b):(c=_.isEqual(b,a),a=_.clone(b)),!c}},j=function(a,b){this.exchange=a,this.topic=b};j.prototype={subscribe:function(a){var b=new k(this.exchange,this.topic,a);return n.configuration.bus.subscribe(b),b},publish:function(a,b){var c=_.extend({exchange:this.exchange,timeStamp:new Date,topic:this.topic},b);n.configuration.bus.publish(a,c)}};var k=function(a,b,c){this.exchange=a,this.topic=b,this.callback=c,this.priority=d,this.constraints=[],this.maxCalls=e,this.onHandled=g,this.context=null,n.publish(f,"subscription.created",{event:"subscription.created",exchange:a,topic:b})};k.prototype={unsubscribe:function(){n.configuration.bus.unsubscribe(this),n.publish(f,"subscription.removed",{event:"subscription.removed",exchange:this.exchange,topic:this.topic})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(a){if(_.isNaN(a)||a<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var b=this.onHandled,c=_.after(a,_.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){b.apply(this.context,arguments),c()},this},ignoreDuplicates:function(){return this.withConstraint(new i),this},whenHandledThenExecute:function(a){if(!_.isFunction(a))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=a,this},withConstraint:function(a){if(!_.isFunction(a))throw"Predicate constraint must be a function";return this.constraints.push(a),this},withConstraints:function(a){var b=this;return _.isArray(a)&&_.each(a,function(a){b.withConstraint(a)}),b},withContext:function(a){return this.context=a,this},withDebounce:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.debounce(b,a),this},withDelay:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=function(c){setTimeout(b,a,c)},this},withPriority:function(a){if(_.isNaN(a))throw"Priority must be a number";return this.priority=a,this},withThrottle:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.throttle(b,a),this}};var l={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+this.regexify(a)+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d},regexify:function(a){return a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")}},m={subscriptions:{},wireTaps:[],publish:function(a,b){this.notifyTaps(a,b),_.each(this.subscriptions[b.exchange],function(c){_.each(c,function(c){n.configuration.resolver.compare(c.topic,b.topic)&&_.all(c.constraints,function(b){return b(a)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[a,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e,f;e=this.subscriptions[a.exchange]=this.subscriptions[a.exchange]||{},f=this.subscriptions[a.exchange][a.topic]=this.subscriptions[a.exchange][a.topic]||[],b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}c||f.unshift(a)},notifyTaps:function(a,b){_.each(this.wireTaps,function(c){c(a,b)})},unsubscribe:function(a){if(this.subscriptions[a.exchange][a.topic]){var b=this.subscriptions[a.exchange][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.exchange][a.topic][c]===a){this.subscriptions[a.exchange][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},n={configuration:{bus:m,resolver:l},channel:function(a,b){var d=arguments.length===2?a:c,e=arguments.length===2?b:a;return new j(d,e)},subscribe:function(a,b,d){var e=arguments.length===3?a:c,f=arguments.length===3?b:a,g=arguments.length===3?d:b,h=this.channel(e,f);return h.subscribe(g)},publish:function(a,b,c,d){var e=h([].slice.call(arguments,0)),f=this.channel(e.envelope.exchange,e.envelope.topic);f.publish(e.payload,e.envelope)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},bindExchanges:function(a,b){var d=[];return _.isArray(a)||(a=[a]),_.isArray(b)||(b=[b]),_.each(a,function(a){var e=a.topic||"*";_.each(b,function(b){var e=b.exchange||c;d.push(n.subscribe(a.exchange||c,a.topic||"*",function(a,c){var d=_.isFunction(b.topic)?b.topic(c.topic):b.topic||c.topic;n.publish(e,d,a)}))})}),d}};a.postal=n})(window)
\ No newline at end of file
+(function(a,b){var c="/",d=50,e=0,f="postal",g=function(){},h=function(a){var b={envelope:{}},d;switch(a.length){case 3:typeof a[1]=="Object"&&typeof a[2]=="Object"?(b.envelope.exchange=c,b.envelope.topic=a[0],b.payload=a[1],d=b.envelope,b.envelope=_.extend(d,a[2])):(b.envelope.exchange=a[0],b.envelope.topic=a[1],b.payload=a[2]);break;case 4:b.envelope.exchange=a[0],b.envelope.topic=a[1],b.payload=a[2],d=b.envelope,b.envelope=_.extend(d,a[3]);break;default:b.envelope.exchange=c,b.envelope.topic=a[0],b.payload=a[1]}return b},i=function(){var a;return function(b){var c=!1;return _.isString(b)?(c=b===a,a=b):(c=_.isEqual(b,a),a=_.clone(b)),!c}},j=function(a,b){this.exchange=a,this.topic=b};j.prototype={subscribe:function(a){var b=new k(this.exchange,this.topic,a);return n.configuration.bus.subscribe(b),b},publish:function(a,b){var c=_.extend({exchange:this.exchange,timeStamp:new Date,topic:this.topic},b);n.configuration.bus.publish(a,c)}};var k=function(a,b,c){this.exchange=a,this.topic=b,this.callback=c,this.priority=d,this.constraints=[],this.maxCalls=e,this.onHandled=g,this.context=null,n.publish(f,"subscription.created",{event:"subscription.created",exchange:a,topic:b})};k.prototype={unsubscribe:function(){n.configuration.bus.unsubscribe(this),n.publish(f,"subscription.removed",{event:"subscription.removed",exchange:this.exchange,topic:this.topic})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(a){if(_.isNaN(a)||a<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var b=this.onHandled,c=_.after(a,_.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){b.apply(this.context,arguments),c()},this},ignoreDuplicates:function(){return this.withConstraint(new i),this},whenHandledThenExecute:function(a){if(!_.isFunction(a))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=a,this},withConstraint:function(a){if(!_.isFunction(a))throw"Predicate constraint must be a function";return this.constraints.push(a),this},withConstraints:function(a){var b=this;return _.isArray(a)&&_.each(a,function(a){b.withConstraint(a)}),b},withContext:function(a){return this.context=a,this},withDebounce:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.debounce(b,a),this},withDelay:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=function(c){setTimeout(b,a,c)},this},withPriority:function(a){if(_.isNaN(a))throw"Priority must be a number";return this.priority=a,this},withThrottle:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.throttle(b,a),this}};var l={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+this.regexify(a)+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d},regexify:function(a){return a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")}},m={subscriptions:{},wireTaps:[],publish:function(a,b){this.notifyTaps(a,b),_.each(this.subscriptions[b.exchange],function(c){_.each(c,function(c){n.configuration.resolver.compare(c.topic,b.topic)&&_.all(c.constraints,function(b){return b(a)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[a,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e,f;e=this.subscriptions[a.exchange]=this.subscriptions[a.exchange]||{},f=this.subscriptions[a.exchange][a.topic]=this.subscriptions[a.exchange][a.topic]||[],b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}c||f.unshift(a)},notifyTaps:function(a,b){_.each(this.wireTaps,function(c){c(a,b)})},unsubscribe:function(a){if(this.subscriptions[a.exchange][a.topic]){var b=this.subscriptions[a.exchange][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.exchange][a.topic][c]===a){this.subscriptions[a.exchange][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},n={configuration:{bus:m,resolver:l},channel:function(a,b){var d=b?a:c,e=b||a;return new j(d,e)},subscribe:function(a,b,d){var e=d||b,f=d?b:a,g=d?a:c,h=this.channel(g,f);return h.subscribe(e)},publish:function(a,b,c,d){var e=h([].slice.call(arguments,0)),f=this.channel(e.envelope.exchange,e.envelope.topic);f.publish(e.payload,e.envelope)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},bindExchanges:function(a,b){var d=[];return _.isArray(a)||(a=[a]),_.isArray(b)||(b=[b]),_.each(a,function(a){var e=a.topic||"*";_.each(b,function(b){var e=b.exchange||c;d.push(n.subscribe(a.exchange||c,a.topic||"*",function(a,c){var d=_.isFunction(b.topic)?b.topic(c.topic):b.topic||c.topic;n.publish(e,d,a)}))})}),d}};a.postal=n})(window)
\ No newline at end of file
diff --git a/lib/node/postal.js b/lib/node/postal.js
index f8d88b9..5161cc9 100644
--- a/lib/node/postal.js
+++ b/lib/node/postal.js
@@ -315,15 +315,15 @@ var postal = {
 	},
 
 	channel: function(exchange, topic) {
-		var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 2 ? topic : exchange;
+		var exch = topic ? exchange : DEFAULT_EXCHANGE,
+			tpc = topic || exchange;
 		return new ChannelDefinition(exch, tpc);
 	},
 
 	subscribe: function(exchange, topic, callback) {
-		var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 3 ? topic : exchange,
-			callbk  = arguments.length === 3 ? callback : topic;
+		var callbk = callback || topic,
+			tpc = callback ? topic : exchange,
+			exch = callback ? exchange : DEFAULT_EXCHANGE;
 		var channel = this.channel(exch, tpc);
 		return channel.subscribe(callbk);
 	},
diff --git a/spec/BindingsResolver.spec.js b/spec/BindingsResolver.spec.js
index 9b5874b..57ea824 100644
--- a/spec/BindingsResolver.spec.js
+++ b/spec/BindingsResolver.spec.js
@@ -1,6 +1,6 @@
 QUnit.specify("postal.js", function(){
     describe("bindingsResolver", function(){
-        describe("When calling regexify", function() {
+        /*describe("When calling regexify", function() {
             describe("With a topic containing no special escape chars", function() {
                 var result = bindingsResolver.regexify("CoolTopic");
                 it("Should equal 'CoolTopic'", function(){
@@ -43,7 +43,7 @@ QUnit.specify("postal.js", function(){
                     assert(result).equals("Top\\..*\\.Bottom");
                 });
             });
-        });
+        });*/
         describe("When calling compare", function(){
             describe("With topic Top.Middle.Bottom and binding Top.Middle.Bottom", function(){
                 var result = bindingsResolver.compare("Top.Middle.Bottom", "Top.Middle.Bottom"),
diff --git a/spec/Postal.spec.js b/spec/Postal.spec.js
index 95c3d84..05d0a94 100644
--- a/spec/Postal.spec.js
+++ b/spec/Postal.spec.js
@@ -10,16 +10,21 @@ QUnit.specify("postal.js", function(){
             var systemSubscription = {};
             before(function(){
 
-                systemSubscription = postal.subscribe( "postal", "subscription.created", function(x){
-                    console.log("on subscription " + JSON.stringify(x));
-                    if( x.event &&
-                        x.event == "subscription.created" &&
-                        x.exchange == "MyExchange" &&
-                        x.topic == "MyTopic") {
-                        caughtSubscribeEvent = true;
-                    };
+                systemSubscription = postal.subscribe({
+	                exchange: "postal",
+	                topic: "subscription.created",
+	                callback: function(x){
+	                    console.log("on subscription " + JSON.stringify(x));
+	                    if( x.event &&
+	                        x.event == "subscription.created" &&
+	                        x.exchange == "MyExchange" &&
+	                        x.topic == "MyTopic") {
+	                        caughtSubscribeEvent = true;
+	                    };
+	                }
                 });
-                subscription = postal.channel("MyExchange","MyTopic")
+
+                subscription = postal.channel({ exchange: "MyExchange", topic: "MyTopic" })
                                      .subscribe(function() { });
                 sub = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0];
             });
@@ -60,16 +65,20 @@ QUnit.specify("postal.js", function(){
                 subExistsAfter = true;
             var systemSubscription = {};
             before(function(){
-                systemSubscription = postal.subscribe( "postal", "subscription.*", function(x){
-                    console.log("on unsubscription " + JSON.stringify(x));
-                    if( x.event &&
-                        x.event == "subscription.removed" &&
-                        x.exchange == "MyExchange" &&
-                        x.topic == "MyTopic") {
-                        caughtUnsubscribeEvent = true;
-                    };
+                systemSubscription = postal.subscribe({
+	                exchange: "postal",
+	                topic: "subscription.*",
+	                callback: function(x){
+	                    console.log("on unsubscription " + JSON.stringify(x));
+	                    if( x.event &&
+	                        x.event == "subscription.removed" &&
+	                        x.exchange == "MyExchange" &&
+	                        x.topic == "MyTopic") {
+	                        caughtUnsubscribeEvent = true;
+	                    };
+	                }
                 });
-                subscription = postal.channel("MyExchange","MyTopic")
+                subscription = postal.channel({ exchange: "MyExchange", topic: "MyTopic" })
                                      .subscribe(function() { });
                 subExistsBefore = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0] !== undefined;
                 subscription.unsubscribe();
@@ -93,7 +102,7 @@ QUnit.specify("postal.js", function(){
             var msgReceivedCnt = 0,
                 msgData;
             before(function(){
-                channel = postal.channel("MyExchange","MyTopic")
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" })
                 subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;});
                 channel.publish("Testing123");
                 subscription.unsubscribe();
@@ -112,7 +121,7 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with a disposeAfter of 5", function(){
             var msgReceivedCnt = 0;
             before(function(){
-                channel = postal.channel("MyExchange","MyTopic");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) { msgReceivedCnt++; })
                                       .disposeAfter(5);
                 channel.publish("Testing123");
@@ -132,7 +141,7 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing and ignoring duplicates", function(){
             var subInvokedCnt = 0;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) { subInvokedCnt++; })
                                       .ignoreDuplicates();
                 channel.publish("Testing123");
@@ -156,7 +165,7 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing and passing onHandled callback", function(){
             var whte = false;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) {  })
                                       .whenHandledThenExecute(function() { whte = true; });
                 channel.publish("Testing123");
@@ -175,7 +184,7 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with one constraint returning true", function(){
             var recvd = false;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) { recvd= true; })
                                       .withConstraint(function() { return true; });
                 channel.publish("Testing123");
@@ -194,7 +203,7 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with one constraint returning false", function(){
             var recvd = false;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) { recvd= true; })
                                       .withConstraint(function() { return false; });
                 channel.publish("Testing123");
@@ -213,7 +222,7 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with multiple constraints returning true", function(){
             var recvd = false;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) { recvd= true; })
                                       .withConstraints([function() { return true; },
                                                        function() { return true; },
@@ -234,7 +243,7 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with multiple constraints and one returning false", function(){
             var recvd = false;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) { recvd= true; })
                                       .withConstraints([function() { return true; },
                                                        function() { return false; },
@@ -260,7 +269,7 @@ QUnit.specify("postal.js", function(){
                     }
                 };
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) { this.increment(); })
                                       .withContext(obj);
                 channel.publish("Testing123");
@@ -275,9 +284,9 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with a hierarchical binding, no wildcards", function(){
             var count = 0, channelB, channelC;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic");
-                channelB = postal.channel("MyExchange", "MyTopic.MiddleTopic");
-                channelC = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic.YetAnother");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic" });
+                channelB = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic" });
+                channelC = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
                 subscription = channel.subscribe(function(data) { count++; });
                 channel.publish("Testing123");
                 channelB.publish("Testing123");
@@ -294,10 +303,10 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with a hierarchical binding, using #", function(){
             var count = 0, channelB, channelC, channelD;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic.#.SubTopic");
-                channelB = postal.channel("MyExchange", "MyTopic.MiddleTopic");
-                channelC = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic");
-                channelD = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic.YetAnother");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic.#.SubTopic" });
+                channelB = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic" });
+                channelC = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic" });
+                channelD = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
                 subscription = channel.subscribe(function(data) { count++; });
                 channelC.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"});
                 channelB.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic", data: "Testing123"});
@@ -314,10 +323,10 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with a hierarchical binding, using *", function(){
             var count = 0, channelB, channelC, channelD;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic.MiddleTopic.*");
-                channelB = postal.channel("MyExchange", "MyTopic.MiddleTopic");
-                channelC = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic");
-                channelD = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic.YetAnother");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.*" });
+                channelB = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic" });
+                channelC = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic" });
+                channelD = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
                 subscription = channel.subscribe(function(data) { count++; });
 
                 channelC.publish("Testing123");
@@ -335,11 +344,11 @@ QUnit.specify("postal.js", function(){
         describe("When subscribing with a hierarchical binding, using # and *", function(){
             var count = 0, channelB, channelC, channelD, channelE;
             before(function(){
-                channel = postal.channel("MyExchange", "MyTopic.#.*");
-                channelB = postal.channel("MyExchange", "MyTopic.MiddleTopic");
-                channelC = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic");
-                channelD = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic.YetAnother");
-                channelE = postal.channel("MyExchange", "OtherTopic.MiddleTopic.SubTopic.YetAnother");
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic.#.*" });
+                channelB = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic" });
+                channelC = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic" });
+                channelD = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
+                channelE = postal.channel({ exchange: "MyExchange", topic: "OtherTopic.MiddleTopic.SubTopic.YetAnother" });
                 subscription = channel.subscribe(function(data) { count++; });
 
                 channelC.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"});
@@ -359,7 +368,7 @@ QUnit.specify("postal.js", function(){
             var msgReceivedCnt = 0,
                 msgData;
             before(function(){
-                channel = postal.channel("MyExchange","MyTopic")
+                channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
                 subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;});
                 postal.publish("MyExchange", "MyTopic", "Testing123");
                 subscription.unsubscribe();
@@ -377,7 +386,11 @@ QUnit.specify("postal.js", function(){
         });
         describe("When using shortcut subscribe api", function(){
             before(function(){
-                subscription = postal.subscribe("MyExchange", "MyTopic", function() { });
+                subscription = postal.subscribe({
+	                exchange: "MyExchange",
+	                topic: "MyTopic",
+	                callback: function() { }
+                });
                 sub = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0];
             });
             after(function(){
@@ -409,18 +422,20 @@ QUnit.specify("postal.js", function(){
             });
         });
 	    describe("when subscribing and unsubscribing a wire tap", function() {
-		    var wireTapData = [],
-			    wireTapEnvelope = [],
+		    var wireTapData,
+			    wireTapEnvelope,
 			    wiretap;
 		    before(function(){
 			    caughtUnsubscribeEvent = false;
-			    wiretap = postal.addWireTap(function(msg, envelope) {
+			    wireTapData = [];
+			    wireTapEnvelope = [];
+			    wiretap = postal.addWireTap(function(envelope, msg) {
 				    wireTapData.push(msg);
 				    wireTapEnvelope.push(envelope);
 			    });
-			    postal.publish("Oh.Hai.There", { data: "I'm in yer bus, tappin' yer subscriptionz..."});
+			    postal.publish({ topic: "Oh.Hai.There" }, { data: "I'm in yer bus, tappin' yer subscriptionz..."});
 			    wiretap();
-			    postal.publish("Oh.Hai.There", { data: "I'm in yer bus, tappin' yer subscriptionz..."});
+			    postal.publish({ topic: "Oh.Hai.There" }, { data: "I'm in yer bus, tappin' yer subscriptionz..."});
 		    });
 		    after(function(){
 			    postal.configuration.bus.subscriptions = {};
@@ -433,6 +448,7 @@ QUnit.specify("postal.js", function(){
 			    assert(wireTapData[0].data).equals("I'm in yer bus, tappin' yer subscriptionz...");
 		    });
 		    it("wireTap envelope should match expected results", function() {
+			    console.log("ONOES! " + JSON.stringify(wireTapEnvelope));
 			    assert(wireTapEnvelope[0].exchange).equals(DEFAULT_EXCHANGE);
 			    assert(wireTapEnvelope[0].topic).equals("Oh.Hai.There");
 		    });
@@ -444,7 +460,7 @@ QUnit.specify("postal.js", function(){
 				    linkages;
 			    before(function(){
 				    linkages = postal.bindExchanges({ exchange: "sourceExchange" }, { exchange: "destinationExchange" });
-				    subscription = postal.subscribe("destinationExchange", "Oh.Hai.There", function(data, env) {
+				    subscription = postal.subscribe({ exchange: "destinationExchange", topic: "Oh.Hai.There", callback: function(data, env) {
 					    destData.push(data);
 					    destEnv.push(env);
 				    });
@@ -473,7 +489,7 @@ QUnit.specify("postal.js", function(){
 				    linkages;
 			    before(function(){
 				    linkages = postal.bindExchanges({ exchange: "sourceExchange", topic: "Oh.Hai.There"  }, { exchange: "destinationExchange", topic: "kthxbye" });
-				    subscription = postal.subscribe("destinationExchange", "kthxbye", function(data, env) {
+				    subscription = postal.subscribe({ exchange: "destinationExchange", topic: "kthxbye", callback: function(data, env) {
 					    destData.push(data);
 					    destEnv.push(env);
 				    });
@@ -502,7 +518,7 @@ QUnit.specify("postal.js", function(){
 				    linkages;
 			    before(function(){
 				    linkages = postal.bindExchanges({ exchange: "sourceExchange"  }, { exchange: "destinationExchange", topic: function(tpc) { return "NewTopic." + tpc; } });
-				    subscription = postal.subscribe("destinationExchange", "NewTopic.Oh.Hai.There", function(data, env) {
+				    subscription = postal.subscribe({ exchange: "destinationExchange", topic: "NewTopic.Oh.Hai.There", callback: function(data, env) {
 					    destData.push(data);
 					    destEnv.push(env);
 				    });
diff --git a/src/main/Api.js b/src/main/Api.js
index 535cd54..591858a 100644
--- a/src/main/Api.js
+++ b/src/main/Api.js
@@ -1,27 +1,39 @@
+var publishPicker = {
+	"2" : function(envelope, payload) {
+		if(!envelope.exchange) {
+			envelope.exchange = DEFAULT_EXCHANGE;
+		}
+		postal.configuration.bus.publish(envelope, payload);
+	},
+	"3" : function(exchange, topic, payload) {
+		postal.configuration.bus.publish({ exchange: exchange, topic: topic }, payload);
+	}
+};
+
 var postal = {
 	configuration: {
 		bus: localBus,
 		resolver: bindingsResolver
 	},
 
-	channel: function(exchange, topic) {
-		var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 2 ? topic : exchange;
+	channel: function(options) {
+		var exch = options.exchange || DEFAULT_EXCHANGE,
+			tpc = options.topic;
 		return new ChannelDefinition(exch, tpc);
 	},
 
-	subscribe: function(exchange, topic, callback) {
-		var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE,
-			tpc  = arguments.length === 3 ? topic : exchange,
-			callbk  = arguments.length === 3 ? callback : topic;
-		var channel = this.channel(exch, tpc);
-		return channel.subscribe(callbk);
+	subscribe: function(options) {
+		var callback = options.callback,
+			topic = options.topic,
+			exchange = options.exchange || DEFAULT_EXCHANGE;
+		return new ChannelDefinition(exchange, topic).subscribe(callback);
 	},
 
-	publish: function(exchange, topic, payload, envelopeOptions) {
-		var parsedArgs = parsePublishArgs([].slice.call(arguments,0));
-		var channel = this.channel(parsedArgs.envelope.exchange, parsedArgs.envelope.topic);
-		channel.publish(parsedArgs.payload, parsedArgs.envelope);
+	publish: function() {
+		var len = arguments.length;
+		if(publishPicker[len]) {
+			publishPicker[len].apply(this, arguments);
+		}
 	},
 
 	addWireTap: function(callback) {
@@ -29,21 +41,28 @@ var postal = {
 	},
 
 	bindExchanges: function(sources, destinations) {
-		var subscriptions = [];
+		var subscriptions;
 		if(!_.isArray(sources)) {
 			sources = [sources];
 		}
 		if(!_.isArray(destinations)) {
 			destinations = [destinations];
 		}
+		subscriptions = new Array(sources.length * destinations.length);
 		_.each(sources, function(source){
 			var sourceTopic = source.topic || "*";
 			_.each(destinations, function(destination) {
 				var destExchange = destination.exchange || DEFAULT_EXCHANGE;
 				subscriptions.push(
-					postal.subscribe(source.exchange || DEFAULT_EXCHANGE, source.topic || "*", function(msg, env) {
-						var destTopic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
-						postal.publish(destExchange, destTopic, msg);
+					postal.subscribe({
+							exchange: source.exchange || DEFAULT_EXCHANGE,
+							topic: source.topic || "*",
+							callback : function(msg, env) {
+								var newEnv = env;
+								newEnv.topic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
+								newEnv.exchange = destExchange;
+								postal.publish(newEnv, msg);
+							}
 					})
 				);
 			});
diff --git a/src/main/BindingsResolver.js b/src/main/BindingsResolver.js
index cf9ad0f..da1d5a3 100644
--- a/src/main/BindingsResolver.js
+++ b/src/main/BindingsResolver.js
@@ -5,7 +5,10 @@ var bindingsResolver = {
         if(this.cache[topic] && this.cache[topic][binding]) {
             return true;
         }
-        var rgx = new RegExp("^" + this.regexify(binding) + "$"), // match from start to end of string
+	    //  binding.replace(/\./g,"\\.")             // escape actual periods
+	    //         .replace(/\*/g, ".*")             // asterisks match any value
+	    //         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
+        var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
             result = rgx.test(topic);
         if(result) {
             if(!this.cache[topic]) {
@@ -14,11 +17,5 @@ var bindingsResolver = {
             this.cache[topic][binding] = true;
         }
         return result;
-    },
-
-    regexify: function(binding) {
-        return binding.replace(/\./g,"\\.") // escape actual periods
-                      .replace(/\*/g, ".*") // asterisks match any value
-                      .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
     }
 };
diff --git a/src/main/ChannelDefinition.js b/src/main/ChannelDefinition.js
index 0ba9c1c..0334ac0 100644
--- a/src/main/ChannelDefinition.js
+++ b/src/main/ChannelDefinition.js
@@ -11,11 +11,10 @@ ChannelDefinition.prototype = {
     },
 
     publish: function(data, envelope) {
-        var env = _.extend({
-            exchange: this.exchange,
-            timeStamp: new Date(),
-            topic: this.topic
-        }, envelope);
-        postal.configuration.bus.publish(data, env);
+        var env = envelope || {};
+	    env.exchange = this.exchange;
+	    env.timeStamp = new Date();
+	    env.topic = this.topic;
+        postal.configuration.bus.publish(env, data);
     }
 };
diff --git a/src/main/Constants.js b/src/main/Constants.js
index a44bbe8..2f46a88 100644
--- a/src/main/Constants.js
+++ b/src/main/Constants.js
@@ -2,36 +2,4 @@ var DEFAULT_EXCHANGE = "/",
     DEFAULT_PRIORITY = 50,
     DEFAULT_DISPOSEAFTER = 0,
     SYSTEM_EXCHANGE = "postal",
-    NO_OP = function() { },
-    parsePublishArgs = function(args) {
-        var parsed = { envelope: { } }, env;
-        switch(args.length) {
-            case 3:
-                if(typeof args[1] === "Object" && typeof args[2] === "Object") {
-                    parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                    parsed.envelope.topic = args[0];
-                    parsed.payload = args[1];
-                    env = parsed.envelope;
-                    parsed.envelope = _.extend(env, args[2]);
-                }
-                else {
-                    parsed.envelope.exchange = args[0];
-                    parsed.envelope.topic = args[1];
-                    parsed.payload = args[2];
-                }
-                break;
-            case 4:
-                parsed.envelope.exchange = args[0];
-                parsed.envelope.topic = args[1];
-                parsed.payload = args[2];
-                env = parsed.envelope;
-                parsed.envelope = _.extend(env, args[3]);
-                break;
-            default:
-                parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                parsed.envelope.topic = args[0];
-                parsed.payload = args[1];
-                break;
-        }
-        return parsed;
-    };
+    NO_OP = function() { };
diff --git a/src/main/LocalBus.js b/src/main/LocalBus.js
index 86928b2..ad50516 100644
--- a/src/main/LocalBus.js
+++ b/src/main/LocalBus.js
@@ -2,10 +2,12 @@ var localBus = {
 
 	subscriptions: {},
 
-	wireTaps: [],
+	wireTaps: new Array(0),
 
-	publish: function(data, envelope) {
-		this.notifyTaps(data, envelope);
+	publish: function(envelope, data) {
+		_.each(this.wireTaps,function(tap) {
+			tap(envelope, data);
+		});
 
 		_.each(this.subscriptions[envelope.exchange], function(topic) {
 			_.each(topic, function(binding){
@@ -22,10 +24,15 @@ var localBus = {
 	},
 
 	subscribe: function(subDef) {
-		var idx, found, fn, exch, subs;
+		var idx, found, fn, exch = this.subscriptions[subDef.exchange], subs;
 
-		exch = this.subscriptions[subDef.exchange] = this.subscriptions[subDef.exchange] || {};
-		subs = this.subscriptions[subDef.exchange][subDef.topic] = this.subscriptions[subDef.exchange][subDef.topic] || [];
+		if(!exch) {
+			exch = this.subscriptions[subDef.exchange] = {};
+		}
+		subs = this.subscriptions[subDef.exchange][subDef.topic]
+		if(!subs) {
+			subs = this.subscriptions[subDef.exchange][subDef.topic] = new Array(0);
+		}
 
 		idx = subs.length - 1;
 		//if(!_.any(subs, function(cfg) { return cfg === subDef; })) {
@@ -42,12 +49,6 @@ var localBus = {
 		//}
 	},
 
-	notifyTaps: function(data, envelope) {
-		_.each(this.wireTaps,function(tap) {
-			tap(data, envelope);
-		});
-	},
-
 	unsubscribe: function(config) {
 		if(this.subscriptions[config.exchange][config.topic]) {
 			var len = this.subscriptions[config.exchange][config.topic].length,
diff --git a/src/main/SubscriptionDefinition.js b/src/main/SubscriptionDefinition.js
index c6072ee..55d7142 100644
--- a/src/main/SubscriptionDefinition.js
+++ b/src/main/SubscriptionDefinition.js
@@ -3,25 +3,29 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
     this.topic = topic;
     this.callback = callback;
     this.priority = DEFAULT_PRIORITY;
-    this.constraints = [];
+    this.constraints = new Array(0);
     this.maxCalls = DEFAULT_DISPOSEAFTER;
     this.onHandled = NO_OP;
     this.context = null;
 
-    _.defer(function() {
-	    postal.publish(SYSTEM_EXCHANGE, "subscription.created",
-		    {
-			    event: "subscription.created",
-			    exchange: exchange,
-			    topic: topic
-		    })
-    });
+    postal.publish({
+		    exchange: SYSTEM_EXCHANGE,
+		    topic: "subscription.created"
+	    },
+        {
+            event: "subscription.created",
+            exchange: exchange,
+            topic: topic
+        });
 };
 
 SubscriptionDefinition.prototype = {
     unsubscribe: function() {
         postal.configuration.bus.unsubscribe(this);
-        postal.publish(SYSTEM_EXCHANGE, "subscription.removed",
+        postal.publish({
+		        exchange: SYSTEM_EXCHANGE,
+	            topic: "subscription.removed"
+            },
             {
                 event: "subscription.removed",
                 exchange: this.exchange,