Update to use the new HeldCore