Hacked DiscoveryService for new Message format.