Support for multiple services

Clone of this: