[FEATURE] XML support in discovery and mapping service

Besides some cleanup this adds support for XML designators in the
DiscoveryService and MappingService classes.