[TASK] Adapt to support Flow 2.2