Root improvements
Rework rooting