Working on using flat event data, instead of event objects
Name changes