Switch to new API calls