Adapt to new service names and add polling mechanism