Updated the match the new core api