Update to match new core