Updated to match the new core api package