Navigation related upgrades