Improve navigation service