Update to match core