[TASK] Improved rootline handling