Improvements for navigation