Enhancements for navigation