Added new event dispatcher class