Adding navigation support for rgrade