Payload refactor