I screwed up - add support for service ID aliases