Improved event handling data structure for dynamic fields ro be more consistent with other events.