[TASK] Simplify saga