Update to use the new core API