improve paths management