Modifications to support xmDNS (sort of)