Better path manipulation