Update to how we write events