Solves #62. Updated to EventDispatcherInterface