Update to consume and publish events in new format