Upgrade to new Service based API