Extracted Message from peerdiscovery and changed it to use message's
Message