Update to last core changes