Upgrade to service API