Updated libeventdispatcher