Support new core