Update to match changes in server side api