Enhance the navigation service