Handle two API versions of flow organization data