Added event dispatcher adapter