Added functionality to keep a master list of event types