Update to handle multiple services.