Switch to modern API calls