Added guid to endpoint and origin to messages.