Further addition of navigation support