Switch to new API call