Updates to new core api