[Task] Minimal changes