Update for new core lib merge