Removed EventDispatcherInterface
Simplified code