diff --git a/src/robotlegs/bender/bundles/mvcs/impl/Mediator.as b/src/robotlegs/bender/bundles/mvcs/impl/Mediator.as
index 306a04ca..2409807e 100644
--- a/src/robotlegs/bender/bundles/mvcs/impl/Mediator.as
+++ b/src/robotlegs/bender/bundles/mvcs/impl/Mediator.as
@@ -54,22 +54,22 @@ package robotlegs.bender.bundles.mvcs.impl
 		/* Protected Functions                                                        */
 		/*============================================================================*/
 
-		protected function addViewListener(eventString:String, listener:Function, eventClass:Class):void
+		protected function addViewListener(eventString:String, listener:Function, eventClass:Class = null):void
 		{
 			eventMap.mapListener(IEventDispatcher(_viewComponent), eventString, listener, eventClass);
 		}
 
-		protected function addContextListener(eventString:String, listener:Function, eventClass:Class):void
+		protected function addContextListener(eventString:String, listener:Function, eventClass:Class = null):void
 		{
 			eventMap.mapListener(eventDispatcher, eventString, listener, eventClass);
 		}
 
-		protected function removeViewListener(eventString:String, listener:Function, eventClass:Class):void
+		protected function removeViewListener(eventString:String, listener:Function, eventClass:Class = null):void
 		{
 			eventMap.unmapListener(IEventDispatcher(_viewComponent), eventString, listener, eventClass);
 		}
 
-		protected function removeContextListener(eventString:String, listener:Function, eventClass:Class):void
+		protected function removeContextListener(eventString:String, listener:Function, eventClass:Class = null):void
 		{
 			eventMap.unmapListener(eventDispatcher, eventString, listener, eventClass);
 		}