Improved path management.