Moved the EventMessage headers to be saved outside the payload.