Cache createTree result
Add 'file' alias in modes
Start to implement saving again