Adjustment to new core api.