JEventDispatcher

Update from JDispatcher