[TASK] Adapt to changes in Flux