Payload & Event Refactoring