Update flow for new API