Improved path manager