Improvements for path map