Replace Response and Event with unified Message