Update for new API