[TASK] Flow 2.0 compatibility