Update for changing API