Added message_payload handling.