Update for the new API