Update according to latest Core