Update to match system/core