Added event dispatcher as a service