Switch to the newer, safer, API