Improve notation
Improve paths handling