Refactor event payloads