Support last core changes