Adapt to the new Service API v2.