ServiceMapFactory revisited