[TASK] support / updates of Flow 2.0