Update for changed API