Changed according to the new core