Adding some modifications so we can pass custom data to the message payload.